diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/LoginViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/LoginViewModel.kt
index b113f1515..eab3f7b75 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/LoginViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/login/LoginViewModel.kt
@@ -60,13 +60,27 @@ class LoginViewModel : ViewModel() {
         isFirstLogin: Boolean,
         newAccountKey: String?,
     ) {
+        clear()
         this.isFirstLogin = isFirstLogin
-        acceptedTerms = isFirstLogin
+        acceptedTerms = !isFirstLogin
         if (newAccountKey != null) {
             key = TextFieldValue(newAccountKey)
         }
     }
 
+    fun clear() {
+        key = TextFieldValue("")
+        password = TextFieldValue("")
+
+        errorManager.clearErrors()
+        acceptedTerms = false
+        processingLogin = false
+        isTemporary = false
+        offerTemporaryLogin = false
+        torSettings = TorSettings()
+        isFirstLogin = false
+    }
+
     fun updateKey(
         value: TextFieldValue,
         throughQR: Boolean,