diff --git a/appengine/src/com/google/android/chrometophone/server/AuthServlet.java b/appengine/src/com/google/android/chrometophone/server/AuthServlet.java
index f27d230..c29f9f0 100644
--- a/appengine/src/com/google/android/chrometophone/server/AuthServlet.java
+++ b/appengine/src/com/google/android/chrometophone/server/AuthServlet.java
@@ -54,9 +54,11 @@ public class AuthServlet extends HttpServlet {
             // side redirect instead
 
             // Sanitize the extRet URL for XSS protection
-            String regEx = "chrome-extension://[a-z]+" +
+            String regExChrome = "chrome-extension://[a-z]+" +
                     (signIn ? "/signed_in\\.html" : "/signed_out\\.html");
-            if (extRet.matches(regEx)) {
+            String regExFirefox = "chrome://sendtophone" +
+                    (signIn ? "/loggedIn" : "/loggedOut");
+            if (extRet.matches(regExChrome) || extRet.matches(regExFirefox)) {
                 resp.getWriter().println("<meta http-equiv=\"refresh\" content=\"0;url=" + extRet + "\">");
             } else {
                 resp.setStatus(400);
diff --git a/appengine/src/com/google/android/chrometophone/server/SendServlet.java b/appengine/src/com/google/android/chrometophone/server/SendServlet.java
index 6ea9d9c..0f7cf0f 100644
--- a/appengine/src/com/google/android/chrometophone/server/SendServlet.java
+++ b/appengine/src/com/google/android/chrometophone/server/SendServlet.java
@@ -39,24 +39,25 @@ public class SendServlet extends HttpServlet {
     private static final String DEVICE_NOT_REGISTERED_STATUS = "DEVICE_NOT_REGISTERED";
     private static final String ERROR_STATUS = "ERROR";
 
+    @Deprecated
     @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        doGet(req, resp);
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        doPost(req, resp);
     }
 
     @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         resp.setContentType("text/plain");
 
         // Check API version
         String apiVersionString = req.getParameter("ver");
         if (apiVersionString == null) apiVersionString = "1";
         int apiVersion = Integer.parseInt(apiVersionString);
-        log.info("Extension version: " + apiVersion);
         if (apiVersion < 3) {
             resp.setStatus(400);
             resp.getWriter().println(ERROR_STATUS +
                     " (Please remove old Chrome extension and install latest)");
+            log.warning("Old extension version not supported: " + apiVersion);
             return;
         }