diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
index 71a3b93..9f3a361 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
@@ -73,8 +73,8 @@
         presenter.init(ringAccountViewModel);
 
         presenter.ringCheckChanged(false);
-        presenter.passwordChanged("password");
-        presenter.passwordConfirmChanged("password");
+        presenter.passwordChanged("");
+        presenter.passwordConfirmChanged("");
     }
 
     @Override
diff --git a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
index 3deac5e..29c302f 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/account/RingAccountCreationPresenter.java
@@ -101,10 +101,7 @@
                 isConfirmCorrect = true;
             }
         }
-        if (password.isEmpty()) {
-            getView().showInvalidPasswordError(false);
-            isPasswordCorrect = false;
-        } else if (password.length() < PASSWORD_MIN_LENGTH) {
+        if (!password.isEmpty() && password.length() < PASSWORD_MIN_LENGTH) {
             getView().showInvalidPasswordError(true);
             isPasswordCorrect = false;
         } else {
@@ -116,10 +113,7 @@
     }
 
     public void passwordConfirmChanged(String passwordConfirm) {
-        if (passwordConfirm.isEmpty()) {
-            getView().showNonMatchingPasswordError(false);
-            isConfirmCorrect = false;
-        } else if (!passwordConfirm.equals(mRingAccountViewModel.getPassword())) {
+        if (!passwordConfirm.isEmpty() && !passwordConfirm.equals(mRingAccountViewModel.getPassword())) {
             getView().showNonMatchingPasswordError(true);
             isConfirmCorrect = false;
         } else {