diff --git a/briar-android/res/layout/activity_password.xml b/briar-android/res/layout/activity_password.xml
index 5a306a79cf1e8fc7d67f3f9d3cf315f83a999f11..e29fcb6a1536a006aa84923455d1d0ed0bfdcf1c 100644
--- a/briar-android/res/layout/activity_password.xml
+++ b/briar-android/res/layout/activity_password.xml
@@ -43,10 +43,12 @@
         style="?android:attr/progressBarStyleInverse"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/btn_sign_in"
-        android:visibility="invisible" />
+        android:layout_below="@id/edit_password"
+        android:layout_marginTop="@dimen/margin_xlarge"
+        android:visibility="gone" />
 
     <TextView
+        android:id="@+id/forgot_password"
         style="@style/BriarTextBody"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 40894692137cf64b61876290b2ae0522d8d81023..6a024f9caf442a46a9608dca37aba8f7caf781c8 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -33,7 +33,7 @@ public class PasswordActivity extends BaseActivity {
 	@Inject @CryptoExecutor private Executor cryptoExecutor;
 	private Button signInButton;
 	private ProgressBar progress;
-	private TextView title;
+	private TextView title, forgotPassword;
 	private EditText password;
 
 	private byte[] encrypted;
@@ -57,6 +57,7 @@ public class PasswordActivity extends BaseActivity {
 		signInButton = (Button) findViewById(R.id.btn_sign_in);
 		progress = (ProgressBar) findViewById(R.id.progress_wheel);
 		title = (TextView) findViewById(R.id.title_password);
+		forgotPassword = (TextView) findViewById(R.id.forgot_password);
 		password = (EditText) findViewById(R.id.edit_password);
 		password.setOnEditorActionListener(new OnEditorActionListener() {
 			@Override
@@ -100,6 +101,7 @@ public class PasswordActivity extends BaseActivity {
 		hideSoftKeyboard();
 		// Replace the button with a progress bar
 		signInButton.setVisibility(GONE);
+		forgotPassword.setVisibility(GONE);
 		progress.setVisibility(VISIBLE);
 		// Decrypt the database key in a background thread
 		final String password = e.toString();
@@ -121,6 +123,7 @@ public class PasswordActivity extends BaseActivity {
 			public void run() {
 				title.setText(R.string.try_again);
 				signInButton.setVisibility(VISIBLE);
+				forgotPassword.setVisibility(VISIBLE);
 				progress.setVisibility(GONE);
 				password.setText("");
 			}