diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
index 59ec6765e..6632f3e80 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
@@ -33,8 +33,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
@@ -70,18 +73,28 @@ public class ActFmGoogleAuthActivity extends ListActivity {
         super.onCreate(savedInstanceState);
         ContextManager.setContext(this);
 
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.gtasks_login_activity);
-        setTitle(R.string.actfm_GAA_title);
+        TextView header = new TextView(this);
+        header.setText(R.string.actfm_GAA_title);
+        header.setTextAppearance(this, R.style.TextAppearance_Medium);
+        header.setPadding(10, 0, 10, 50);
+        getListView().addHeaderView(header);
 
         accountManager = new GoogleAccountManager(this);
         Account[] accounts = accountManager.getAccounts();
         ArrayList<String> accountNames = new ArrayList<String>();
-        for (Account a : accounts) {
+        for (Account a : accounts)
             accountNames.add(a.name);
-        }
 
         nameArray = accountNames.toArray(new String[accountNames.size()]);
         setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, nameArray));
+        findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
index 1b06dff28..91fcb584c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@@ -33,8 +33,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
@@ -87,8 +90,14 @@ public class GtasksLoginActivity extends ListActivity {
         super.onCreate(savedInstanceState);
         ContextManager.setContext(this);
 
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.gtasks_login_activity);
-        setTitle(R.string.gtasks_GLA_title);
+        TextView header = new TextView(this);
+        header.setText(R.string.actfm_GAA_title);
+        header.setTextAppearance(this, R.style.TextAppearance_Medium);
+        header.setPadding(10, 0, 10, 50);
+        getListView().addHeaderView(header);
 
         accountManager = new GoogleAccountManager(this);
         Account[] accounts = accountManager.getAccounts();
@@ -100,6 +109,12 @@ public class GtasksLoginActivity extends ListActivity {
         nameArray = accountNames.toArray(new String[accountNames.size()]);
 
         setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, nameArray));
+        findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     @Override
diff --git a/astrid/res/layout/gtasks_login_activity.xml b/astrid/res/layout/gtasks_login_activity.xml
index c573b861e..24c0943d4 100644
--- a/astrid/res/layout/gtasks_login_activity.xml
+++ b/astrid/res/layout/gtasks_login_activity.xml
@@ -8,11 +8,27 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"/>
         
-  <TextView android:id="@android:id/empty"
+  <LinearLayout android:id="@android:id/empty"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:text="@string/gtasks_GLA_noaccounts"
+        android:layout_height="wrap_content"
+        android:paddingLeft="20dip"
+        android:paddingRight="20dip"
         android:gravity="center"
-        style="@style/TextAppearance.TLA_NoItems" />
+        android:orientation="vertical">
+        
+      <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/gtasks_GLA_noaccounts"
+            android:gravity="center"
+            style="@style/TextAppearance.TLA_NoItems" />
+        
+      <Button android:id="@+id/empty_button"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="50dip"
+            android:text="@string/DLG_ok" />
+        
+  </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 749700d43..7c1dfb7e3 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -225,7 +225,7 @@
   <string name="actfm_ALA_login_title">Login to Astrid.com</string>
 
   <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Select a Google account:</string>
+  <string name="actfm_GAA_title">Select the Google account you want to use:</string>
 
   <!-- ================================================ Synchronization == -->