diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
index 2b9c0adebddfdd289b532f3f231a758e99997a16..49c90239c9e6f76ee543ce0d885812c78b36fa89 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/PasswordFragment.java
@@ -112,15 +112,17 @@ public class PasswordFragment extends SetupFragment {
 
 	@Override
 	public void onClick(View view) {
-		if (!setupController.needToShowDozeFragment()) {
-			nextButton.setVisibility(INVISIBLE);
-			progressBar.setVisibility(VISIBLE);
-		}
 		IBinder token = passwordEntry.getWindowToken();
 		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
 		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
 		setupController.setPassword(passwordEntry.getText().toString());
-		setupController.showDozeFragmentOrCreateAccount();
+		if (setupController.needToShowDozeFragment()) {
+			setupController.showDozeFragment();
+		} else {
+			nextButton.setVisibility(INVISIBLE);
+			progressBar.setVisibility(VISIBLE);
+			setupController.createAccount();
+		}
 	}
 
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
index e9681c5470609bd5511ffc64a4deecac49a51c12..7d130b26a2b4bd34d04e3e4cf1ca9990f2080ded 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupController.java
@@ -22,10 +22,9 @@ public interface SetupController {
 
 	/**
 	 * This should be called after the author name and the password have been
-	 * set. It decides whether to show the doze fragment or create the account
-	 * right away.
+	 * set.
 	 */
-	void showDozeFragmentOrCreateAccount();
+	void showDozeFragment();
 
 	/**
 	 * This should be called after the author name and the password have been
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
index 2d8fb420ceb88c709248e3510d813c20b40b7693..a491aee7a7c14db7c8edd1b1d548acc6e2b4a1a7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SetupControllerImpl.java
@@ -63,10 +63,9 @@ public class SetupControllerImpl extends PasswordControllerImpl
 	}
 
 	@Override
-	public void showDozeFragmentOrCreateAccount() {
+	public void showDozeFragment() {
 		if (setupActivity == null) throw new IllegalStateException();
-		if (needToShowDozeFragment()) setupActivity.showDozeFragment();
-		else createAccount();
+		setupActivity.showDozeFragment();
 	}
 
 	@Override
diff --git a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
index cfad66d8840631c4ff26c97af00e0a4209aff83e..4ddc21cc97cf65344a1a7f0b593e0df25d33af42 100644
--- a/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
+++ b/briar-android/src/test/java/org/briarproject/briar/android/login/PasswordFragmentTest.java
@@ -73,7 +73,7 @@ public class PasswordFragmentTest {
 
 		// assert controller has been called properly
 		verify(setupController, times(1)).setPassword(safePass);
-		verify(setupController, times(1)).showDozeFragmentOrCreateAccount();
+		verify(setupController, times(1)).createAccount();
 	}
 
 	@Test