diff --git a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
index 29bd682e5b..a743e121f5 100644
--- a/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/login/login.component.ts
@@ -53,7 +53,12 @@ export class LoginComponent {
           this.store.dispatch(new Navigate([redirectUrl]));
         }),
         catchError(err => {
-          this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error');
+          this.toasterService.error(
+            snq(() => err.error.error_description) ||
+              snq(() => err.error.error.message, 'AbpAccount::DefaultErrorMessage'),
+            'Error',
+            { life: 7000 },
+          );
           return throwError(err);
         }),
         finalize(() => (this.inProgress = false)),
diff --git a/npm/ng-packs/packages/account/src/lib/components/register/register.component.html b/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
index 4590b521ac..b834d9c6c4 100644
--- a/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
+++ b/npm/ng-packs/packages/account/src/lib/components/register/register.component.html
@@ -8,7 +8,7 @@
         <div class="form-group">
           <label for="input-user-name">{{ 'AbpAccount::UserName' | abpLocalization }}</label
           ><span> * </span
-          ><input autofocus type="text" id="input-user-name" class="form-control" formControlName="username" autofocus/>
+          ><input autofocus type="text" id="input-user-name" class="form-control" formControlName="username" />
         </div>
         <div class="form-group">
           <label for="input-email-address">{{ 'AbpAccount::EmailAddress' | abpLocalization }}</label
diff --git a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
index ee0cdf6635..6f0aa106a1 100644
--- a/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/register/register.component.ts
@@ -24,7 +24,12 @@ export class RegisterComponent {
       username: ['', [required, maxLength(255)]],
       password: [
         '',
-        [required, maxLength(32), minLength(6), validatePassword(['small', 'capital', 'number', 'special'])],
+        [
+          required,
+          maxLength(32),
+          // minLength(6),
+          // validatePassword(['small', 'capital', 'number', 'special']),
+        ],
       ],
       email: ['', [required, email]],
     });
@@ -47,7 +52,12 @@ export class RegisterComponent {
       .pipe(
         take(1),
         catchError(err => {
-          this.toasterService.error(snq(() => err.error.error_description, 'An error occured.'), 'Error');
+          this.toasterService.error(
+            snq(() => err.error.error_description) ||
+              snq(() => err.error.error.message, 'AbpAccount::DefaultErrorMessage'),
+            'Error',
+            { life: 7000 },
+          );
           return throwError(err);
         }),
         finalize(() => (this.inProgress = false)),
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
index 9d1cfb9662..2604bcdaab 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
@@ -80,14 +80,14 @@ export class ErrorHandler {
           case 500:
             this.createErrorComponent({
               title: '500',
-              details: 'Sorry, an error has occured.',
+              details: 'AbpAccount::InternalServerErrorMessage',
             });
             break;
           case 0:
             if ((err as HttpErrorResponse).statusText === 'Unknown Error') {
               this.createErrorComponent({
                 title: 'Unknown Error',
-                details: 'Sorry, an error has occured.',
+                details: 'AbpAccount::InternalServerErrorMessage',
               });
             }
             break;