diff --git a/kdb-bot/src/bot_api/service/auth_service.py b/kdb-bot/src/bot_api/service/auth_service.py
index 4c9fcaf190..ba45a15531 100644
--- a/kdb-bot/src/bot_api/service/auth_service.py
+++ b/kdb-bot/src/bot_api/service/auth_service.py
@@ -349,7 +349,7 @@ class AuthService(AuthServiceABC):
             raise ServiceException(ServiceErrorCode.InvalidUser, 'Wrong password')
 
         # update password
-        if self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt) != user.password:
+        if update_user_dto.new_auth_user.password is not None and self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt) != user.password:
             user.password_salt = uuid.uuid4()
             user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
 
@@ -396,7 +396,7 @@ class AuthService(AuthServiceABC):
             user.email = update_user_dto.new_auth_user.email
 
         # update password
-        if update_user_dto.change_password and user.password != self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt):
+        if update_user_dto.new_auth_user.password is not None and update_user_dto.change_password and user.password != self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt):
             user.password_salt = uuid.uuid4()
             user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
 
diff --git a/kdb-web/src/app/modules/view/change-password/components/change-password/change-password.component.html b/kdb-web/src/app/modules/view/change-password/components/change-password/change-password.component.html
index 0532651f16..3bf4f2381e 100644
--- a/kdb-web/src/app/modules/view/change-password/components/change-password/change-password.component.html
+++ b/kdb-web/src/app/modules/view/change-password/components/change-password/change-password.component.html
@@ -20,7 +20,7 @@
             <div class="input-field">
                 <input type="password" pInputText formControlName="passwordRepeat"
                     placeholder="{{'view.change-password.repeat_new_password' | translate}}"
-                    [ngClass]="{ 'invalid-feedback-input': submitted && errors.repeatPassword}">
+                    [ngClass]="{ 'invalid-feedback-input': submitted && errors.repeatPassword}" autocomplete="new-password">
                 <div *ngIf="submitted" class="invalid-feedback">
                     <div *ngIf="errors.repeatPassword">{{'view.change-password.passwords_do_not_match' | translate}}</div>
                 </div>
@@ -32,4 +32,4 @@
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>