diff --git a/app/models.py b/app/models.py
index 9ac98da..5eec5ab 100644
--- a/app/models.py
+++ b/app/models.py
@@ -276,7 +276,7 @@ class User(db.Model):
             # user already exists in database, set their admin status based on group membership (if enabled)
             if LDAP_GROUP_SECURITY_ENABLED:
                 self.set_admin(isadmin)
-            self.update_profile()
+
             return True
         else:
             logging.error('Unsupported authentication method')
@@ -314,9 +314,9 @@ class User(db.Model):
         if User.query.count() == 0:
             self.role_id = Role.query.filter_by(name='Administrator').first().id
 
-        self.password = self.get_hashed_password(self.plain_text_password)
+        self.password = self.get_hashed_password(self.plain_text_password) if self.plain_text_password else '*'
 
-        if self.password:
+        if self.password and self.password != '*':
             self.password = self.password.decode("utf-8")
 
         db.session.add(self)
diff --git a/app/templates/admin_setting_authentication.html b/app/templates/admin_setting_authentication.html
index ff5924a..e929065 100644
--- a/app/templates/admin_setting_authentication.html
+++ b/app/templates/admin_setting_authentication.html
@@ -181,10 +181,10 @@
                                             <dd>Define how you want to filter your user in LDAP query.
                                                 <ul>
                                                     <li>
-                                                        Basic filter - The filter that will be applied to all LDAP query by PDA. (e.g. <i>(objectClass=inetorgperson)</i> for LDAP and <i>(objectClass=organizationalPerson)</i> for Active Directory)
+                                                        Basic filter - The filter that will be applied to all LDAP query by PDA. (e.g. <i>(objectClass=inetorgperson)</i> for OpenLDAP and <i>(objectClass=organizationalPerson)</i> for Active Directory)
                                                     </li>
                                                     <li>
-                                                        Username field - The field PDA will look for user's username. (e.g. <i>uid</i> for LDAP and <i>userPrincipalName</i> for Active Directory)
+                                                        Username field - The field PDA will look for user's username. (e.g. <i>uid</i> for OpenLDAP and <i>sAMAccountName</i> or <i>userPrincipalName</i> for Active Directory)
                                                     </li>
                                                 </ul>
                                             </dd>
diff --git a/app/templates/login.html b/app/templates/login.html
index be201df..54c24bc 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -31,22 +31,14 @@
         {{ error }}
       </div>
   {% endif %}
-      <form action="" method="post">
+      <form action="" method="post" data-toggle="validator">
       <div class="form-group">
-        {% if username %}
-        <input type="text" class="form-control" placeholder="Username" name="username" value="{{ username }}">
-        {% else %}
-        <input type="text" class="form-control" placeholder="Username" name="username">
-        {% endif %}
-        <span class="glyphicon glyphicon-user form-control-feedback"></span>
+        <input type="text" class="form-control" placeholder="Username" name="username" data-error="Please input your username" required {% if username %}value="{{ username }}"{% endif %}>
+        <span class="help-block with-errors"></span>
       </div>
       <div class="form-group">
-        {% if password %}
-        <input type="password" class="form-control" placeholder="Password" name="password" value="{{ password }}">
-        {% else %}
-        <input type="password" class="form-control" placeholder="Password" name="password">
-        {% endif %}
-        <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+        <input type="password" class="form-control" placeholder="Password" name="password" data-error="Please input your password" required {% if password %}value="{{ password }}"{% endif %}>
+        <span class="help-block with-errors"></span>
       </div>
       <div class="form-group">
         <input type="otptoken" class="form-control" placeholder="OTP Token" name="otptoken">
@@ -125,6 +117,10 @@
 {% assets "js_login" -%}
   <script type="text/javascript" src="{{ ASSET_URL }}"></script>
 {%- endassets %}
+{% assets "js_validation" -%}
+  <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+{%- endassets %}
+
 <script>
   $(function () {
     $('input').iCheck({
diff --git a/app/templates/maintenance.html b/app/templates/maintenance.html
index 0701324..4478aeb 100644
--- a/app/templates/maintenance.html
+++ b/app/templates/maintenance.html
@@ -12,7 +12,7 @@
 <article>
     <h1>We&rsquo;ll be back soon!</h1>
     <div>
-        <p>Sorry for the inconvenience but we&rsquo;re performing some maintenance at the moment. If you need to you can always <a href="mailto:ngokhanhit@gmail.com">contact us</a>, otherwise we&rsquo;ll be back online shortly!</p>
+        <p>Sorry for the inconvenience but we&rsquo;re performing some maintenance at the moment. Please contact the System Administrator if you need more information</a>, otherwise we&rsquo;ll be back online shortly!</p>
         <p>&mdash; Team</p>
     </div>
 </article>
\ No newline at end of file
diff --git a/app/templates/register.html b/app/templates/register.html
index 0efc19f..593279c 100644
--- a/app/templates/register.html
+++ b/app/templates/register.html
@@ -1,96 +1,98 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Register - {{ SITE_NAME }}</title>
-  <!-- Tell the browser to be responsive to screen width -->
-  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-  {% assets "css_login" -%}
-      <link rel="stylesheet" href="{{ ASSET_URL }}">
-  {%- endassets %}
-
-  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-  <!--[if lt IE 9]>
-  <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-  <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-  <![endif]-->
-</head>
-<body class="hold-transition register-page">
-<div class="register-box">
-  <div class="register-logo">
-    <a href="{{ url_for('index') }}"><b>PowerDNS</b>-Admin</a>
-  </div>
-<div class="register-box-body">
-            {% if error %}
-            <div class="alert alert-danger alert-dismissible">
-                <button type="button" class="close" data-dismiss="alert"
-                    aria-hidden="true">&times;</button>
-                {{ error }}
-            </div>
-            {% endif %}
-            <p class="login-box-msg">Enter your personal details below</p>
-            <form action="{{ url_for('login') }}" method="post">
-                <div class="form-group has-feedback">
-                    <input type="text" class="form-control" placeholder="First Name"
-                        name="firstname"> <span
-                        class="glyphicon glyphicon-user form-control-feedback"></span>
-                </div>
-                <div class="form-group has-feedback">
-                    <input type="text" class="form-control" placeholder="Last name"
-                        name="lastname"> <span
-                        class="glyphicon glyphicon-user form-control-feedback"></span>
-                </div>
-                <div class="form-group has-feedback">
-                    <input type="email" class="form-control" placeholder="Email"
-                        name="email"> <span
-                        class="glyphicon glyphicon-envelope form-control-feedback"></span>
-                </div>
-                <p class="login-box-msg">Enter your account details below</p>
-                <div class="form-group has-feedback">
-                    <input type="text" class="form-control" placeholder="Username"
-                        name="username"> <span
-                        class="glyphicon glyphicon-user form-control-feedback"></span>
-                </div>
-                <div class="form-group has-feedback">
-                    <input type="password" class="form-control" placeholder="Password"
-                        name="password"> <span
-                        class="glyphicon glyphicon-lock form-control-feedback"></span>
-                </div>
-                <div class="form-group has-feedback">
-                    <input type="password" class="form-control"
-                        placeholder="Retype password" name="rpassword"> <span
-                        class="glyphicon glyphicon-log-in form-control-feedback"></span>
-                </div>
-                <div class="row">
-                    <div class="col-xs-4 pull-left">
-                        <button type="button" class="btn btn-flat btn-block"
-                            id="button_back">Back</button>
-                    </div>
-                    <div class="col-xs-4 pull-right">
-                        <button type="submit" class="btn btn-flat btn-primary btn-block">Register</button>
-                    </div>
-                    <!-- /.col -->
-                </div>
-            </form>
-        </div>
-  <!-- /.form-box -->
-  <div class="login-box-footer">
-    <center><p>Powered by <a href="https://github.com/ngoduykhanh/PowerDNS-Admin">PowerDNS-Admin</a></p></center>
-  </div>
-</div>
-<!-- /.login-box -->
-
-{% assets "js_login" -%}
-  <script type="text/javascript" src="{{ ASSET_URL }}"></script>
-{%- endassets %}
-<script>
-  $(function () {
-    $('#button_back').click(function(){
-        window.location.href='{{ url_for('login') }}';
-    })
-  });
-</script>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title>Register - {{ SITE_NAME }}</title>
+  <!-- Tell the browser to be responsive to screen width -->
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+  {% assets "css_login" -%}
+      <link rel="stylesheet" href="{{ ASSET_URL }}">
+  {%- endassets %}
+
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+  <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
+</head>
+<body class="hold-transition register-page">
+<div class="register-box">
+  <div class="register-logo">
+    <a href="{{ url_for('index') }}"><b>PowerDNS</b>-Admin</a>
+  </div>
+<div class="register-box-body">
+            {% if error %}
+            <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert"
+                    aria-hidden="true">&times;</button>
+                {{ error }}
+            </div>
+            {% endif %}
+            <p class="login-box-msg">Enter your personal details below</p>
+            <form action="{{ url_for('login') }}" method="post" data-toggle="validator">
+                <div class="form-group has-feedback">
+                    <input type="text" class="form-control" placeholder="First Name" name="firstname" data-error="Please input your first name" required>
+                    <span class="glyphicon glyphicon-user form-control-feedback"></span>
+                    <span class="help-block with-errors"></span>
+                </div>
+                <div class="form-group has-feedback">
+                    <input type="text" class="form-control" placeholder="Last name" name="lastname" data-error="Please input your last name" required>
+                    <span class="glyphicon glyphicon-user form-control-feedback"></span>
+                    <span class="help-block with-errors"></span>
+                </div>
+                <div class="form-group has-feedback">
+                    <input type="email" class="form-control" placeholder="Email" name="email" data-error="Please input your valid email address"
+                    pattern="^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$" required>
+                    <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+                    <span class="help-block with-errors"></span>
+                </div>
+                <p class="login-box-msg">Enter your account details below</p>
+                <div class="form-group has-feedback">
+                    <input type="text" class="form-control" placeholder="Username" name="username" data-error="Please input your username" required>
+                    <span class="glyphicon glyphicon-user form-control-feedback"></span>
+                    <span class="help-block with-errors"></span>
+                </div>
+                <div class="form-group has-feedback">
+                    <input type="password" class="form-control" placeholder="Password" id="password" name="password" data-error="Please input your password" required>
+                    <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+                </div>
+                <div class="form-group has-feedback">
+                    <input type="password" class="form-control" placeholder="Retype password" name="rpassword" data-match="#password" data-match-error="Password confirmation does not match" required>
+                    <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
+                    <span class="help-block with-errors"></span>
+                </div>
+                <div class="row">
+                    <div class="col-xs-4 pull-left">
+                        <button type="button" class="btn btn-flat btn-block" id="button_back">Back</button>
+                    </div>
+                    <div class="col-xs-4 pull-right">
+                        <button type="submit" class="btn btn-flat btn-primary btn-block">Register</button>
+                    </div>
+                    <!-- /.col -->
+                </div>
+            </form>
+        </div>
+  <!-- /.form-box -->
+  <div class="login-box-footer">
+    <center><p>Powered by <a href="https://github.com/ngoduykhanh/PowerDNS-Admin">PowerDNS-Admin</a></p></center>
+  </div>
+</div>
+<!-- /.login-box -->
+
+{% assets "js_login" -%}
+  <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+{%- endassets %}
+{% assets "js_validation" -%}
+  <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+{%- endassets %}
+<script>
+  $(function () {
+    $('#button_back').click(function(){
+        window.location.href='{{ url_for('login') }}';
+    })
+  });
+</script>
+</body>
+</html>
diff --git a/app/views.py b/app/views.py
index 9d62c1e..e5e9bd6 100644
--- a/app/views.py
+++ b/app/views.py
@@ -68,7 +68,7 @@ def before_request():
 
     # check site maintenance mode
     maintenance = Setting().get('maintenance')
-    if maintenance and g.user.role.name != 'Administrator':
+    if maintenance and current_user.is_authenticated and current_user.role.name != 'Administrator':
         return render_template('maintenance.html')
 
 
@@ -297,7 +297,6 @@ def login():
         email = user_data['email']
         user = User.query.filter_by(username=email).first()
         if not user:
-            # create user
             user = User(username=email,
                         firstname=first_name,
                         lastname=surname,
@@ -389,15 +388,13 @@ def login():
         # registration case
         user = User(username=username, plain_text_password=password, firstname=firstname, lastname=lastname, email=email)
 
-        # TODO: Move this into the JavaScript
-        # validate password and password confirmation
         if password != rpassword:
             error = "Password confirmation does not match"
             return render_template('register.html', error=error)
 
         try:
             result = user.create_local_user()
-            if result == True:
+            if result and result['status']:
                 return render_template('login.html', saml_enabled=SAML_ENABLED, username=username, password=password)
             else:
                 return render_template('register.html', error=result['msg'])