improvement of solution

@@ -215,6 +215,7 @@ public class AuthController extends BaseController {
             User user = userService.findUserById(TenantId.SYS_TENANT_ID, credentials.getUserId());
             User user = userService.findUserById(TenantId.SYS_TENANT_ID, credentials.getUserId());
             UserPrincipal principal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
             UserPrincipal principal = new UserPrincipal(UserPrincipal.Type.USER_NAME, user.getEmail());
             SecurityUser securityUser = new SecurityUser(user, credentials.isEnabled(), principal);
             SecurityUser securityUser = new SecurityUser(user, credentials.isEnabled(), principal);
+            userService.setUserCredentialsEnabled(user.getTenantId(), user.getId(), true);
             String baseUrl = systemSecurityService.getBaseUrl(user.getTenantId(), user.getCustomerId(), request);
             String baseUrl = systemSecurityService.getBaseUrl(user.getTenantId(), user.getCustomerId(), request);
             String loginUrl = String.format("%s/login", baseUrl);
             String loginUrl = String.format("%s/login", baseUrl);
             String email = user.getEmail();
             String email = user.getEmail();

@@ -19,13 +19,13 @@
   <button mat-raised-button color="primary"
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'disableAccount')"
           (click)="onEntityAction($event, 'disableAccount')"
-          [fxShow]="!isEdit && isUserCredentialsEnabled()">
+          [fxShow]="!isEdit && isUserCredentialPresent() && isUserCredentialsEnabled()">
     {{'user.disable-account' | translate }}
     {{'user.disable-account' | translate }}
   </button>
   </button>
   <button mat-raised-button color="primary"
   <button mat-raised-button color="primary"
           [disabled]="(isLoading$ | async)"
           [disabled]="(isLoading$ | async)"
           (click)="onEntityAction($event, 'enableAccount')"
           (click)="onEntityAction($event, 'enableAccount')"
-          [fxShow]="!isEdit && !isUserCredentialsEnabled()">
+          [fxShow]="!isEdit && isUserCredentialPresent() && !isUserCredentialsEnabled()">
     {{'user.enable-account' | translate }}
     {{'user.enable-account' | translate }}
   </button>
   </button>
   <button mat-raised-button color="primary"
   <button mat-raised-button color="primary"

@@ -56,11 +56,12 @@ export class UserComponent extends EntityComponent<User> {
   }
   }
 
 
   isUserCredentialsEnabled(): boolean {
   isUserCredentialsEnabled(): boolean {
-    if (!this.entity || !this.entity.additionalInfo || isUndefined(this.entity.additionalInfo.userCredentialsEnabled)) {
-      return true;
-    } else {
       return this.entity.additionalInfo.userCredentialsEnabled === true;
       return this.entity.additionalInfo.userCredentialsEnabled === true;
-    }
+  }
+
+  isUserCredentialPresent(): boolean {
+    return !(!this.entity || !this.entity.additionalInfo || isUndefined(this.entity.additionalInfo.userCredentialsEnabled));
+
   }
   }
 
 
   buildForm(entity: User): FormGroup {
   buildForm(entity: User): FormGroup {