diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 29549c7..f795765 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -52,7 +52,6 @@
 			android:id="@+id/login_description"
 			android:text="@string/login_description"
 			android:textSize="20sp"
-			android:autoLink="web"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 	</LinearLayout>
@@ -63,48 +62,47 @@
 				  android:layout_weight="1"
 				  android:layout_marginBottom="30px" >
 
+		<!-- Google -->
 		<com.google.android.gms.common.SignInButton
 			android:id="@+id/login_button_google"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:layout_gravity="center" />
 
-	</LinearLayout>
-
 		<!--&lt;!&ndash; Google &ndash;&gt;-->
-		<!--<ImageButton-->
-			<!--android:id="@+id/login_button_google"-->
-			<!--android:layout_width="wrap_content"-->
-			<!--android:layout_weight="1"-->
-			<!--android:layout_height="match_parent"-->
-			<!--android:background="#ce4d39"-->
-			<!--android:layout_marginLeft="30px"-->
-			<!--android:layout_marginRight="30px"-->
-			<!--android:src="@drawable/social_google" />-->
+		<!--<ImageButton
+			android:id="@+id/login_button_google"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#ce4d39"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_google" />-->
 
 		<!--&lt;!&ndash; Facebook &ndash;&gt;-->
-		<!--<ImageButton-->
-			<!--android:id="@+id/login_button_facebook"-->
-			<!--android:layout_width="wrap_content"-->
-			<!--android:layout_weight="1"-->
-			<!--android:layout_height="match_parent"-->
-			<!--android:background="#305891"-->
-			<!--android:layout_marginLeft="30px"-->
-			<!--android:layout_marginRight="30px"-->
-			<!--android:src="@drawable/social_facebook" />-->
+		<!--<ImageButton
+			android:id="@+id/login_button_facebook"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#305891"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_facebook" />-->
 
 		<!--&lt;!&ndash; Twitter &ndash;&gt;-->
-		<!--<ImageButton-->
-			<!--android:id="@+id/login_button_twitter"-->
-			<!--android:layout_width="wrap_content"-->
-			<!--android:layout_weight="1"-->
-			<!--android:layout_height="match_parent"-->
-			<!--android:background="#2ca8d2"-->
-			<!--android:layout_marginLeft="30px"-->
-			<!--android:layout_marginRight="30px"-->
-			<!--android:src="@drawable/social_twitter" />-->
+		<!--<ImageButton
+			android:id="@+id/login_button_twitter"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#2ca8d2"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_twitter" />-->
 
-	<!--</LinearLayout>-->
+	</LinearLayout>
 
 	<!-- Login form -->
 	<LinearLayout android:layout_width="match_parent"
@@ -142,20 +140,17 @@
 	</LinearLayout>
 
 	<!-- Extra text -->
-	<LinearLayout android:layout_height="wrap_content"
+	<LinearLayout android:layout_height="31dp"
 				  android:layout_width="match_parent"
 				  android:orientation="vertical"
-				  android:layout_marginTop="20px"
-				  android:layout_weight="1">
+				  android:layout_marginTop="20px" >
 
 		<!-- Forgot password link -->
 		<TextView android:id="@+id/login_forgot_password"
 				  android:text="@string/login_forgot_password"
-				  android:autoLink="web"
 				  android:layout_width="match_parent"
 				  android:layout_height="wrap_content"
-				  android:textColor="@color/Yellow"
-				  android:textSize="24sp" />
+				  android:textSize="20sp" />
 
 		<!-- Errors -->
 		<TextView
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cdf723a..e1de3f8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -8,7 +8,7 @@
 	<string name="google_connection_error">FEHLER: Könnte nicht zum Google API Server verbinden. </string>
 	<string name="help_name">Hilfe</string>
 	<string name="loading">Ladet…</string>
-	<string name="login_description">Zu Tracman einloggen.  Wenn Sie kein Konto haben, können Sie <a href="https://tracman.org/login#join">einen neuen machen</a>.  </string>
+	<string name="login_description">Einloggen oder <a href="https://tracman.org/login#join">ein neues Konto erstellen</a>. </string>
 	<string name="login_name">Einloggen</string>
 	<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
 	<string name="logout_name">Ausloggen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f87f20b..45e7fe5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -14,7 +14,7 @@
 	<string name="broadcast_disabled">Transmisiónes apagado</string>
 	<string name="google_connection_error">ERROR: No se puede conectar al Google API servidor. </string>
 	<string name="help_name">Ayuda</string>
-	<string name="login_description">Iniciar una sesión. Si no tiene una cuenta de Tracman, puede <a href="https://tracman.org/login">participar</a>.  </string>
+	<string name="login_description">Iniciar una sesión o <a href="https://tracman.org/login">participar</a>. </string>
 	<string name="login_name">Iniciar sesión</string>
 	<string name="login_no_user_error">ERROR: Usario no encontrado</string>
 	<string name="logout_name">Cerrar sesión</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 957bd69..7e8af54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
 	<!-- Strings related to login -->
 	<string name="login_name">Login</string>
 	<string name="logout_name">Logout</string>
-	<string name="login_description">Log in to Tracman.  If you don\'t have an account, you can <a href="https://tracman.org/login#join">create one</a>.  </string>
+	<string name="login_description">Log in or <a href="https://tracman.org/login#join">create an account</a>. </string>
 	<string name="server_connection_error">ERROR: Unable to connect to Tracman server.  </string>
 
 	<!-- Strings related to notifications -->
@@ -97,7 +97,7 @@
 	<string name="bugs_name">Bug report</string>
 	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a></string>
 	<string name="login_button_text">Login</string>
-    <string name="email">email</string>
+	<string name="email">email</string>
 	<string name="password">password</string>
 	<string name="notify_disabled">Not sending updates</string>
 	<string name="notify_connecting">"Connecting… "</string>