diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 6a66fff17..d732f8478 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -51,6 +51,7 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.facebook.android.AsyncFacebookRunner;
@@ -333,8 +334,11 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
             body.getChildAt(body.indexOfChild(password) - 1).setVisibility(View.GONE);
             password.setVisibility(View.GONE);
 
+            ScrollView bodyScroll = new ScrollView(ActFmLoginActivity.this);
+            bodyScroll.addView(body);
+
             dialog.set(new AlertDialog.Builder(ActFmLoginActivity.this).setView(
-                    body).setIcon(R.drawable.icon_32).setTitle(
+                    bodyScroll).setIcon(R.drawable.icon_32).setTitle(
                     R.string.actfm_ALA_signup_title).setPositiveButton(
                     android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
diff --git a/astrid/res/layout-land/actfm_login_activity.xml b/astrid/res/layout-land/actfm_login_activity.xml
index afab78c17..04ea7053d 100644
--- a/astrid/res/layout-land/actfm_login_activity.xml
+++ b/astrid/res/layout-land/actfm_login_activity.xml
@@ -90,7 +90,7 @@
                 android:id="@+id/pw_login"
                 android:layout_width="match_parent"
                 android:layout_height="45dp"
-                android:paddingLeft="20dip"
+                android:paddingLeft="17dip"
                 android:paddingRight="20dip"
                 android:layout_marginLeft="15dip"
                 android:layout_marginRight="15dip"
diff --git a/astrid/res/layout/actfm_login_activity.xml b/astrid/res/layout/actfm_login_activity.xml
index 778ada941..c146e7245 100644
--- a/astrid/res/layout/actfm_login_activity.xml
+++ b/astrid/res/layout/actfm_login_activity.xml
@@ -48,12 +48,13 @@
           android:layout_width="fill_parent"
           android:layout_height="45dip"
           android:layout_alignParentBottom="true"
-          android:paddingLeft="20dip"
+          android:paddingLeft="17dip"
           android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
           android:layout_marginBottom="20dip"
-          android:textSize="16sp" 
+          android:drawableLeft="@drawable/notif_astrid"
+          android:textSize="14sp" 
           android:text="@string/welcome_login_pw"/>    
       
         <com.facebook.android.LoginButton