diff --git a/src/js/remote.js b/src/js/remote.js
index 4dca5674e..085a27985 100644
--- a/src/js/remote.js
+++ b/src/js/remote.js
@@ -1151,8 +1151,8 @@ Remote.prototype.request_ripple_balance = function (account, issuer, currency, c
           'account_balance'     : ( accountHigh ? balance.negate() : balance).parse_issuer(account),
           'peer_balance'        : (!accountHigh ? balance.negate() : balance).parse_issuer(issuer),
 
-          'account_limit'       : ( accountHigh ? highLimit : lowLimit).parse_issuer(account),       // As set by account
-          'peer_limit'          : (!accountHigh ? highLimit : lowLimit).parse_issuer(issuer),
+          'account_limit'       : ( accountHigh ? highLimit : lowLimit).parse_issuer(issuer),
+          'peer_limit'          : (!accountHigh ? highLimit : lowLimit).parse_issuer(account),
 
           'account_quality_in'  : ( accountHigh ? node.HighQualityIn : node.LowQualityIn),
           'peer_quality_in'     : (!accountHigh ? node.HighQualityIn : node.LowQualityIn),
diff --git a/test/send-test.js b/test/send-test.js
index f105c008b..2c2c390a8 100644
--- a/test/send-test.js
+++ b/test/send-test.js
@@ -155,9 +155,9 @@ buster.testCase("Sending", {
 //                console.log("peer_balance: %s", m.peer_balance.to_text_full());
 //                console.log("peer_limit: %s", m.peer_limit.to_text_full());
                   buster.assert(m.account_balance.equals("0/USD/alice"));
-                  buster.assert(m.account_limit.equals("800/USD/alice"));
+                  buster.assert(m.account_limit.equals("800/USD/mtgox"));
                   buster.assert(m.peer_balance.equals("0/USD/mtgox"));
-                  buster.assert(m.peer_limit.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_limit.equals("0/USD/alice"));
 
                   callback();
                 })
@@ -172,9 +172,9 @@ buster.testCase("Sending", {
             self.remote.request_ripple_balance("alice", "mtgox", "USD", 'CURRENT')
               .on('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("0/USD/alice"));
-                  buster.assert(m.account_limit.equals("700/USD/alice"));
+                  buster.assert(m.account_limit.equals("700/USD/mtgox"));
                   buster.assert(m.peer_balance.equals("0/USD/mtgox"));
-                  buster.assert(m.peer_limit.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_limit.equals("0/USD/alice"));
 
                   callback();
                 })
@@ -248,9 +248,9 @@ buster.testCase("Sending", {
                   // console.log("proposed: %s", JSON.stringify(m));
 
                   buster.assert(m.account_balance.equals("0/USD/alice"));
-                  buster.assert(m.account_limit.equals("600/USD/alice"));
+                  buster.assert(m.account_limit.equals("600/USD/bob"));
                   buster.assert(m.peer_balance.equals("0/USD/bob"));
-                  buster.assert(m.peer_limit.equals("500/USD/bob"));
+                  buster.assert(m.peer_limit.equals("500/USD/alice"));
 
                   callback();
                 })
@@ -262,9 +262,9 @@ buster.testCase("Sending", {
             self.remote.request_ripple_balance("bob", "alice", "USD", 'CURRENT')
               .on('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("0/USD/bob"));
-                  buster.assert(m.account_limit.equals("500/USD/bob"));
+                  buster.assert(m.account_limit.equals("500/USD/alice"));
                   buster.assert(m.peer_balance.equals("0/USD/alice"));
-                  buster.assert(m.peer_limit.equals("600/USD/alice"));
+                  buster.assert(m.peer_limit.equals("600/USD/bob"));
 
                   callback();
                 })