diff --git a/src/client/app/js/app/state/AuthLogin.js b/src/client/app/js/app/state/AuthLogin.js
index ef6e0a4..0befbb0 100644
--- a/src/client/app/js/app/state/AuthLogin.js
+++ b/src/client/app/js/app/state/AuthLogin.js
@@ -152,6 +152,7 @@ app.state.AuthLogin = function()
                     },
                     function( err, code )
                     {
+                        app.core.View.toastError( _lc( 'GENERAL_SERVER_ERROR' ) );
                     }
                 );
             }
diff --git a/src/client/app/tmpl/auth-login.html b/src/client/app/tmpl/auth-login.html
index 421e471..fc86146 100644
--- a/src/client/app/tmpl/auth-login.html
+++ b/src/client/app/tmpl/auth-login.html
@@ -52,9 +52,9 @@
     </form>
 </section>
 <section data-id="section-not-validated"
-         style="display: none">
+         style="display: none" class="bg-white rounded pb_form_v1 form-auth-login">
     <form data-id="form-login-not-validated"
-          class="bg-white rounded pb_form_v1 form-auth-login needs-validation"
+          class="needs-validation"
           novalidate>
         <h2 class="mb-4 mt-0 text-center">
             <%= _lc( 'ACCOUNT_NOT_VALIDATED' ) %>
@@ -70,41 +70,46 @@
             </button>
         </div>
     </form>
-</section>
-<section data-id="section-not-validated-change-email"
-         style="display: none;">
-    <div data-id="auth-change-email">
-        <div class="auth-change-email">
-            <p><%=raw _lc( 'REGISTRATION_EMAIL_PROVIDED' ) %></p>
-            <div data-id="auth-change-registered-email" class="font-bold"></div>
-            <div data-id="auth-change-registered-email-info">
-                <p><%=raw _lc( 'REGISTRATION_EMAIL_CHECK_NOTE' ) %></p>
-                <p><%=raw _lc( 'REGISTRATION_EMAIL_CHANGE_NOTE' ) %></p>
-            </div>
-            <div data-id="auth-change-registered-email-info-changed" class="pb_color-danger">
-                <p><%=raw _lc( 'REGISTRATION_EMAIL_CHANGED_SUCCESS_INFO' ) %></p>
-            </div>
+    <div data-id="section-not-validated-change-email"
+         style="display: none;padding-top: 20px;">
+        <div data-id="auth-change-email">
+            <div class="auth-change-email">
+                <p class="text-center"><%=raw _lc( 'REGISTRATION_EMAIL_PROVIDED' ) %><br /><br />
+                    <strong data-id="auth-change-registered-email" style="font-size: 20px;"></strong>
+                </p>
+                <p class="text-center" data-id="auth-change-registered-email-info">
+                    <%=raw _lc( 'REGISTRATION_EMAIL_CHECK_NOTE' ) %><br />
+                    <%=raw _lc( 'REGISTRATION_EMAIL_CHANGE_NOTE' ) %>
+                </p>
+                <p class="text-center pb_color-danger" data-id="auth-change-registered-email-info-changed">
+                    <%=raw _lc( 'REGISTRATION_EMAIL_CHANGED_SUCCESS_INFO' ) %>
+                </p>
 
-            <form data-id="form-not-validated-email-change"
-                  class="bg-white rounded pb_form_v1 form-auth-login needs-validation"
-                  novalidate>
-                <label for="input-change-email"
-                       data-id=""
-                       class="sr-only">
-                    <%= _lc( 'LOGIN_EMAIL' ) %>
-                </label>
-                <input type="email"
-                       id="input-change-email"
-                       data-id="input-change-email"
-                       class="form-control reverse pb_height-50"
-                       placeholder="<%= _lc( 'LOGIN_EMAIL' ) %>"
-                       required autofocus />
-                <button class="btn btn-lg btn-primary btn-block"
-                        data-id="btn-not-validated-email-change"
-                        type="button">
-                    <%= _lc( 'REGISTRATION_EMAIL_CHANGE_BTN' ) %>
-                </button>
-            </form>
+                <form data-id="form-not-validated-email-change"
+                      class="needs-validation"
+                      novalidate>
+                    <div class="form-group">
+                        <label for="input-change-email"
+                               data-id=""
+                               class="sr-only">
+                            <%= _lc( 'LOGIN_EMAIL' ) %>
+                        </label>
+                        <input type="email"
+                               id="input-change-email"
+                               data-id="input-change-email"
+                               class="form-control reverse pb_height-50"
+                               placeholder="<%= _lc( 'LOGIN_EMAIL' ) %>"
+                               required autofocus />
+                    </div>
+                    <div class="form-group">
+                        <button class="btn btn-lg btn-primary btn-block"
+                                data-id="btn-not-validated-email-change"
+                                type="button">
+                            <%= _lc( 'REGISTRATION_EMAIL_CHANGE_BTN' ) %>
+                        </button>
+                    </div>
+                </form>
+            </div>
         </div>
     </div>
 </section>
\ No newline at end of file
diff --git a/src/client/app/tmpl/auth-start-join.html b/src/client/app/tmpl/auth-start-join.html
index db978c0..8f06dc0 100644
--- a/src/client/app/tmpl/auth-start-join.html
+++ b/src/client/app/tmpl/auth-start-join.html
@@ -102,10 +102,18 @@
         <p class="text-center">
             <%=raw _lc( 'REGISTER_SUCCESS_HEADER_DESCRIPTION' ) %>
         </p>
-        <p>
+        <p class="text-center">
             <%=raw _lc( 'REGISTRATION_EMAIL_PROVIDED' ) %>
-            <div data-id="validation-registered-email" class="font-bold"></div>
+        </p>
+        <p class="text-center">
+            <strong data-id="validation-registered-email" style="font-size: 20px;"></strong>
+        </p>
+        <p class="text-center">
             <%=raw _lc( 'REGISTRATION_SUCCESS_EMAIL_CHECK_NOTE' ) %>
+        </p>
+        <p class="text-center">
+
+
         </p>
         <p class="text-center">
             <a href="#/auth/login"><%= _lc( 'BACK_TO_LOGIN' ) %></a>