2 files changed, 10 insertions, 1 deletions
diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js
index 221640c5..8f53b27f 100644
--- a/StoneIsland/www/js/lib/account/AccountView.js
+++ b/StoneIsland/www/js/lib/account/AccountView.js
@@ -14,6 +14,11 @@ var AccountView = View.extend({
   },
   
   populateAddresses: function(data){
+    console.log("populate addresses:", data)
+    if (! data.AddressBook) {
+      console.log("no addresses")
+      return
+    }
     data.AddressBook.forEach(function(address){
       if (addressBookItem.isDefault) {
         // populate app.shipping.address
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 71d3c8d0..367bd356 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -16,9 +16,13 @@ var SignupView = FormView.extend({
   },
   
   show: function(){
+    var msg = "* Your personal and payment<br>information will always remain private"
+    if (auth.logged_in()) {
+      msg += "<br><br>You are already logged in."
+    }
     app.footer.show("SUBMIT", "CANCEL")
     this.$form.get(0).reset()
-    this.$msg.html("* Your personal and payment<br />information will always remain private")
+    this.$msg.html(msg)
     document.body.className = "signup"
   },