diff --git a/app/src/main/kotlin/com/intelligentbackpack/app/ui/common/PasswordField.kt b/app/src/main/kotlin/com/intelligentbackpack/app/ui/common/PasswordField.kt
index 47c74c06..fde0734b 100644
--- a/app/src/main/kotlin/com/intelligentbackpack/app/ui/common/PasswordField.kt
+++ b/app/src/main/kotlin/com/intelligentbackpack/app/ui/common/PasswordField.kt
@@ -25,15 +25,16 @@ import androidx.compose.ui.text.input.VisualTransformation
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PasswordFiled(
-    password: MutableState<String>,
+    value: String,
+    onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
     imeAction: ImeAction,
     keyboardActions: KeyboardActions
 ) {
     var passwordVisible by remember { mutableStateOf(false) }
     OutlinedTextField(
-        value = password.value,
-        onValueChange = { password.value = it },
+        value = value,
+        onValueChange = onValueChange,
         label = { Text("Password") },
         singleLine = true,
         placeholder = { Text("Password") },
diff --git a/app/src/main/kotlin/com/intelligentbackpack/app/view/CreateUser.kt b/app/src/main/kotlin/com/intelligentbackpack/app/view/CreateUser.kt
index 1665fe27..eee02a71 100644
--- a/app/src/main/kotlin/com/intelligentbackpack/app/view/CreateUser.kt
+++ b/app/src/main/kotlin/com/intelligentbackpack/app/view/CreateUser.kt
@@ -122,8 +122,8 @@ fun CreateForm(
         var email by rememberSaveable { mutableStateOf(emailInsert) }
         var name by rememberSaveable { mutableStateOf("") }
         var surname by rememberSaveable { mutableStateOf("") }
-        val password = rememberSaveable { mutableStateOf("") }
-        val passwordConfirm = rememberSaveable { mutableStateOf("") }
+        var password by rememberSaveable { mutableStateOf("") }
+        var passwordConfirm by rememberSaveable { mutableStateOf("") }
         OutlinedTextField(
             value = email,
             onValueChange = { email = it },
@@ -173,7 +173,8 @@ fun CreateForm(
             })
         )
         PasswordFiled(
-            password = password,
+            value = password,
+            onValueChange = { password = it },
             imeAction = ImeAction.Next,
             keyboardActions = KeyboardActions(onNext = {
                 localFocusManager.moveFocus(FocusDirection.Down)
@@ -181,7 +182,8 @@ fun CreateForm(
             modifier = Modifier.fillMaxWidth(0.8f)
         )
         PasswordFiled(
-            password = passwordConfirm,
+            value = passwordConfirm,
+            onValueChange = { passwordConfirm = it },
             imeAction = ImeAction.Done,
             keyboardActions = KeyboardActions(onDone = {
                 localFocusManager.clearFocus()
@@ -200,7 +202,7 @@ fun CreateForm(
                             email = email,
                             name = name,
                             surname = surname,
-                            password = password.value
+                            password = password,
                         )
                     )
                     localFocusManager.clearFocus()
diff --git a/app/src/main/kotlin/com/intelligentbackpack/app/view/Login.kt b/app/src/main/kotlin/com/intelligentbackpack/app/view/Login.kt
index 9b8b2459..af35cf53 100644
--- a/app/src/main/kotlin/com/intelligentbackpack/app/view/Login.kt
+++ b/app/src/main/kotlin/com/intelligentbackpack/app/view/Login.kt
@@ -126,7 +126,7 @@ fun LoginForm(
         verticalArrangement = Arrangement.spacedBy(6.dp, Alignment.CenterVertically)
     ) {
         var email by rememberSaveable { mutableStateOf("") }
-        val password = rememberSaveable { mutableStateOf("") }
+        var password by rememberSaveable { mutableStateOf("") }
         OutlinedTextField(
             value = email,
             onValueChange = { email = it },
@@ -144,10 +144,11 @@ fun LoginForm(
             })
         )
         PasswordFiled(
-            password = password,
+            value = password,
+            onValueChange = { password = it },
             imeAction = ImeAction.Done,
             keyboardActions = KeyboardActions(onDone = {
-                activateLogin(email, password.value)
+                activateLogin(email, password)
                 localFocusManager.clearFocus()
             }),
             modifier = Modifier.fillMaxWidth(0.8f)
@@ -178,7 +179,7 @@ fun LoginForm(
             }
             Button(
                 onClick = {
-                    activateLogin(email, password.value)
+                    activateLogin(email, password)
                     localFocusManager.clearFocus()
                 },
                 modifier = Modifier