diff --git a/android/src/com/google/android/apps/chrometophone/ShareLinkActivity.java b/android/src/com/google/android/apps/chrometophone/ShareLinkActivity.java
index 12923a3..daf4b65 100644
--- a/android/src/com/google/android/apps/chrometophone/ShareLinkActivity.java
+++ b/android/src/com/google/android/apps/chrometophone/ShareLinkActivity.java
@@ -79,9 +79,7 @@ public class ShareLinkActivity extends Activity implements Handler.Callback {
                 try {
                     List<NameValuePair> params = new ArrayList<NameValuePair>();
                     params.add(new BasicNameValuePair("url", mPendingLink));
-                    params.add(new BasicNameValuePair("deviceName", "Chrome," +
-                            (DeviceRegistrar.isTablet(ShareLinkActivity.this) ? "Phone" : "Tablet")));
-
+                    params.add(new BasicNameValuePair("deviceName", "Chrome"));
                     SharedPreferences settings = Prefs.get(ShareLinkActivity.this);
                     final String accountName = settings.getString("accountName", null);
                     if (accountName == null) {
diff --git a/appengine/src/com/google/android/chrometophone/server/SendServlet.java b/appengine/src/com/google/android/chrometophone/server/SendServlet.java
index e5be1af..23b7ba0 100644
--- a/appengine/src/com/google/android/chrometophone/server/SendServlet.java
+++ b/appengine/src/com/google/android/chrometophone/server/SendServlet.java
@@ -120,6 +120,9 @@ public class SendServlet extends HttpServlet {
                             deviceInfo, reqDebug);
                 }
 
+                // ***** TEMP LOGGING for debugging on test version. Remove before production push *****
+                log.info("Sending " + url + " to " + deviceInfo.getDeviceRegistrationID());
+
                 if (res) {
                     log.info("Link sent to phone! collapse_key:" + collapseKey);
                     ok = true;
diff --git a/extension/send_logic.js b/extension/send_logic.js
index 4200f79..10443bc 100644
--- a/extension/send_logic.js
+++ b/extension/send_logic.js
@@ -150,6 +150,10 @@ function initializeBrowserChannel() {
       } else if (req.responseText.indexOf('NOT_ENABLED') == 0) {
         console.log('Not initializing browser channel because feature not enabled for user');
       }
+    } else {  // server not happy, random backoff
+      var delay = Math.random() * 20000;
+      console.log('Failed to register browser channel (' + req.status + '), retrying in ' + delay + 'ms');
+      setTimeout('initializeBrowserChannel()', delay);
     }
   }, {
       'method': 'POST',