diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenController.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenController.java
index e3b6e000..6211cb67 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenController.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenController.java
@@ -19,6 +19,7 @@ class AccountManagerScreenController {
 
     void setView(AccountManagerScreenView view) {
         this.view = view;
+        this.view.lockUserNameField(model.hasInitialValue());
     }
 
     void updateView() {
diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenModel.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenModel.java
index e0dd15d0..1867ec91 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenModel.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenModel.java
@@ -28,6 +28,10 @@ class AccountManagerScreenModel {
         return initialValue;
     }
 
+    boolean hasInitialValue(){
+        return initialValue!=null;
+    }
+
     boolean isCurrentValueValid() {
         return !currentValue.equals(initialValue)
                 && currentValue.getUsername()!=null
diff --git a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenView.java b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenView.java
index 3d9d6410..b3639b49 100644
--- a/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenView.java
+++ b/Workspace/client/src/main/java/com/pqt/client/gui/modules/account_screen/account_manager_screen/AccountManagerScreenView.java
@@ -104,4 +104,8 @@ class AccountManagerScreenView implements IFXComponent{
             }
         });
     }
+
+    void lockUserNameField(boolean lock) {
+        nameTextField.setDisable(lock);
+    }
 }