diff --git a/app/assets.py b/app/assets.py
index e6f93b4..06cfa37 100644
--- a/app/assets.py
+++ b/app/assets.py
@@ -28,6 +28,11 @@ js_login = Bundle(
     output='generated/login.js'
 )
 
+js_validation = Bundle(
+    'node_modules/bootstrap-validator/dist/validator.js',
+    output='generated/validation.js'
+)
+
 css_main = Bundle(
     'node_modules/bootstrap/dist/css/bootstrap.css',
     'node_modules/font-awesome/css/font-awesome.css',
@@ -62,6 +67,7 @@ js_main = Bundle(
 
 assets = Environment()
 assets.register('js_login', js_login)
+assets.register('js_validation', js_validation)
 assets.register('css_login', css_login)
 assets.register('js_main', js_main)
 assets.register('css_main', css_main)
diff --git a/app/templates/admin_setting_authentication.html b/app/templates/admin_setting_authentication.html
index 34dbe81..6942e5c 100644
--- a/app/templates/admin_setting_authentication.html
+++ b/app/templates/admin_setting_authentication.html
@@ -24,6 +24,12 @@
                     <h3 class="box-title">Authentication Settings</h3>
                 </div>
                 <div class="box-body">
+                    {% if result %}
+                    <div class="alert {% if result['status'] %}alert-success{% else %}alert-danger{% endif%} alert-dismissible">
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                        {{ result['msg'] }}
+                    </div>
+                    {% endif %}
                     <!-- Custom Tabs -->
                     <div class="nav-tabs-custom" id="tabs">
                         <ul class="nav nav-tabs">
@@ -52,7 +58,7 @@
                             <div class="tab-pane active" id="tabs-ldap">
                                 <div class="row">
                                     <div class="col-md-4">
-                                        <form role="form" method="post">
+                                        <form role="form" method="post" data-toggle="validator">
                                             <input type="hidden" value="ldap" name="config_tab" />
                                             <fieldset>
                                                 <legend>GENERAL</legend>
@@ -77,30 +83,35 @@
                                                 <legend>ADMINISTRATOR INFO</legend>
                                                 <div class="form-group">
                                                     <label for="ldap_uri">LDAP URI</label>
-                                                    <input type="text" class="form-control" name="ldap_uri" id="ldap_uri" placeholder="e.g. ldaps://your-ldap-server:636" value="{{ SETTING.get('ldap_uri') }}">
+                                                    <input type="text" class="form-control" name="ldap_uri" id="ldap_uri" placeholder="e.g. ldaps://your-ldap-server:636" data-error="Please input LDAP URI" value="{{ SETTING.get('ldap_uri') }}">
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_base_dn">LDAP Base DN</label>
-                                                    <input type="text" class="form-control" name="ldap_base_dn" id="ldap_base_dn" placeholder="e.g. dc=mydomain,dc=com" value="{{ SETTING.get('ldap_base_dn') }}">
+                                                    <input type="text" class="form-control" name="ldap_base_dn" id="ldap_base_dn" placeholder="e.g. dc=mydomain,dc=com" data-error="Please input LDAP Base DN" value="{{ SETTING.get('ldap_base_dn') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_admin_username">LDAP admin username</label>
-                                                    <input type="text" class="form-control" name="ldap_admin_username" id="ldap_admin_username" placeholder="e.g. cn=admin,dc=mydomain,dc=com" value="{{ SETTING.get('ldap_admin_username') }}">
+                                                    <input type="text" class="form-control" name="ldap_admin_username" id="ldap_admin_username" placeholder="e.g. cn=admin,dc=mydomain,dc=com" data-error="Please input LDAP admin username" value="{{ SETTING.get('ldap_admin_username') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_admin_password">LDAP admin password</label>
-                                                    <input type="password" class="form-control" name="ldap_admin_password" id="ldap_admin_password" placeholder="LDAP Admin password" value="{{ SETTING.get('ldap_admin_password') }}">
+                                                    <input type="password" class="form-control" name="ldap_admin_password" id="ldap_admin_password" placeholder="LDAP Admin password" data-error="Please input LDAP admin password" value="{{ SETTING.get('ldap_admin_password') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <fieldset>
                                                 <legend>FILTERS</legend>
                                                 <div class="form-group">
                                                     <label for="ldap_filter_basic">Basic filter</label>
-                                                    <input type="text" class="form-control" name="ldap_filter_basic" id="ldap_filter_basic" placeholder="e.g. (objectClass=inetorgperson)"value="{{ SETTING.get('ldap_filter_basic') }}">
+                                                    <input type="text" class="form-control" name="ldap_filter_basic" id="ldap_filter_basic" placeholder="e.g. (objectClass=inetorgperson)" data-error="Please input LDAP filter" value="{{ SETTING.get('ldap_filter_basic') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_filter_username">Username field</label>
-                                                    <input type="text" class="form-control" name="ldap_filter_username" id="ldap_filter_username" placeholder="e.g. uid" value="{{ SETTING.get('ldap_filter_username') }}">
+                                                    <input type="text" class="form-control" name="ldap_filter_username" id="ldap_filter_username" placeholder="e.g. uid" data-error="Please input field for username filtering" value="{{ SETTING.get('ldap_filter_username') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <fieldset>
@@ -119,11 +130,13 @@
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_admin_group">Admin group</label>
-                                                    <input type="text" class="form-control" name="ldap_admin_group" id="ldap_admin_group" placeholder="e.g. cn=sysops,dc=mydomain,dc=com" value="{{ SETTING.get('ldap_admin_group') }}">
+                                                    <input type="text" class="form-control" name="ldap_admin_group" id="ldap_admin_group" placeholder="e.g. cn=sysops,dc=mydomain,dc=com"  data-error="Please input LDAP DN for Admin group" value="{{ SETTING.get('ldap_admin_group') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="ldap_user_group">User group</label>
-                                                    <input type="text" class="form-control" name="ldap_user_group" id="ldap_user_group" placeholder="e.g. cn=users,dc=mydomain,dc=com" value="{{ SETTING.get('ldap_user_group') }}">
+                                                    <input type="text" class="form-control" name="ldap_user_group" id="ldap_user_group" placeholder="e.g. cn=users,dc=mydomain,dc=com" data-error="Please input LDAP DN for User group" value="{{ SETTING.get('ldap_user_group') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <div class="form-group">
@@ -140,7 +153,7 @@
                             <div class="tab-pane" id="tabs-google">
                                 <div class="row">
                                     <div class="col-md-4">
-                                        <form role="form" method="post">
+                                        <form role="form" method="post" data-toggle="validator">
                                             <input type="hidden" value="google" name="config_tab" />
                                             <fieldset>
                                                 <legend>GENERAL</legend>
@@ -150,30 +163,36 @@
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="google_oauth_client_id">Client ID</label>
-                                                    <input type="text" class="form-control" name="google_oauth_client_id" id="google_oauth_client_id" placeholder="Google OAuth client ID" value="{{ SETTING.get('google_oauth_client_id') }}">
+                                                    <input type="text" class="form-control" name="google_oauth_client_id" id="google_oauth_client_id" placeholder="Google OAuth client ID" data-error="Please input Client ID" value="{{ SETTING.get('google_oauth_client_id') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="google_oauth_client_secret">Client secret</label>
-                                                    <input type="text" class="form-control" name="google_oauth_client_secret" id="google_oauth_client_secret" placeholder="Google OAuth client secret" value="{{ SETTING.get('google_oauth_client_secret') }}">
+                                                    <input type="text" class="form-control" name="google_oauth_client_secret" id="google_oauth_client_secret" placeholder="Google OAuth client secret" data-error="Please input Client secret" value="{{ SETTING.get('google_oauth_client_secret') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <fieldset>
                                                 <legend>ADVANCE</legend>
                                                 <div class="form-group">
                                                     <label for="google_token_url">Token URL</label>
-                                                    <input type="text" class="form-control" name="google_token_url" id="google_token_url" placeholder="e.g. https://accounts.google.com/o/oauth2/token" value="{{ SETTING.get('google_token_url') }}">
+                                                    <input type="text" class="form-control" name="google_token_url" id="google_token_url" placeholder="e.g. https://accounts.google.com/o/oauth2/token" data-error="Please input token URL" value="{{ SETTING.get('google_token_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="google_token_params">Token params</label>
-                                                    <input type="text" class="form-control" name="google_token_params" id="google_token_params" placeholder="e.g. {'scope': 'email profile'}" value="{{ SETTING.get('google_token_params') }}">
+                                                    <input type="text" class="form-control" name="google_token_params" id="google_token_params" placeholder="e.g. {'scope': 'email profile'}" data-error="Please input token params" value="{{ SETTING.get('google_token_params') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="google_authorize_url">Authorize URL</label>
-                                                    <input type="text" class="form-control" name="google_authorize_url" id="google_authorize_url" placeholder="e.g. https://accounts.google.com/o/oauth2/auth" value="{{ SETTING.get('google_authorize_url') }}">
+                                                    <input type="text" class="form-control" name="google_authorize_url" id="google_authorize_url" placeholder="e.g. https://accounts.google.com/o/oauth2/auth" data-error="Please input Authorize URL" value="{{ SETTING.get('google_authorize_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="google_base_url">Base URL</label>
-                                                    <input type="text" class="form-control" name="google_base_url" id="google_base_url" placeholder="e.g. https://www.googleapis.com/oauth2/v1/" value="{{ SETTING.get('google_base_url') }}">
+                                                    <input type="text" class="form-control" name="google_base_url" id="google_base_url" placeholder="e.g. https://www.googleapis.com/oauth2/v1/" data-error="Please input base URL" value="{{ SETTING.get('google_base_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <div class="form-group">
@@ -190,7 +209,7 @@
                             <div class="tab-pane" id="tabs-github">
                                 <div class="row">
                                     <div class="col-md-4">
-                                        <form role="form" method="post">
+                                        <form role="form" method="post" data-toggle="validator">
                                             <input type="hidden" value="github" name="config_tab" />
                                             <fieldset>
                                                 <legend>GENERAL</legend>
@@ -200,30 +219,36 @@
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="github_oauth_key">Client key</label>
-                                                    <input type="text" class="form-control" name="github_oauth_key" id="github_oauth_key" placeholder="Google OAuth client ID" value="{{ SETTING.get('github_oauth_key') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_key" id="github_oauth_key" placeholder="Google OAuth client ID" data-error="Please input Client key" value="{{ SETTING.get('github_oauth_key') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="github_oauth_secret">Client secret</label>
-                                                    <input type="text" class="form-control" name="github_oauth_secret" id="github_oauth_secret" placeholder="Google OAuth client secret" value="{{ SETTING.get('github_oauth_secret') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_secret" id="github_oauth_secret" placeholder="Google OAuth client secret" data-error="Please input Client secret" value="{{ SETTING.get('github_oauth_secret') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <fieldset>
                                                 <legend>ADVANCE</legend>
                                                 <div class="form-group">
                                                     <label for="github_oauth_scope">Scope</label>
-                                                    <input type="text" class="form-control" name="github_oauth_scope" id="github_oauth_scope" placeholder="e.g. email" value="{{ SETTING.get('github_oauth_scope') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_scope" id="github_oauth_scope" placeholder="e.g. email" data-error="Please input scope" value="{{ SETTING.get('github_oauth_scope') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="github_oauth_api_url">API URL</label>
-                                                    <input type="text" class="form-control" name="github_oauth_api_url" id="github_oauth_api_url" placeholder="e.g. https://api.github.com/user" value="{{ SETTING.get('github_oauth_api_url') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_api_url" id="github_oauth_api_url" placeholder="e.g. https://api.github.com/user" data-error="Please input API URL" value="{{ SETTING.get('github_oauth_api_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="github_oauth_token_url">Token URL</label>
-                                                    <input type="text" class="form-control" name="github_oauth_token_url" id="github_oauth_token_url" placeholder="e.g. https://github.com/login/oauth/access_token" value="{{ SETTING.get('github_oauth_token_url') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_token_url" id="github_oauth_token_url" placeholder="e.g. https://github.com/login/oauth/access_token" data-error="Please input Token URL" value="{{ SETTING.get('github_oauth_token_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                                 <div class="form-group">
                                                     <label for="github_oauth_authorize_url">Authorize URL</label>
-                                                    <input type="text" class="form-control" name="github_oauth_authorize_url" id="github_oauth_authorize_url" placeholder="e.g. https://github.com/login/oauth/authorize" value="{{ SETTING.get('github_oauth_authorize_url') }}">
+                                                    <input type="text" class="form-control" name="github_oauth_authorize_url" id="github_oauth_authorize_url" placeholder="e.g. https://github.com/login/oauth/authorize" data-error="Plesae input Authorize URL" value="{{ SETTING.get('github_oauth_authorize_url') }}">
+                                                    <span class="help-block with-errors"></span>
                                                 </div>
                                             </fieldset>
                                             <div class="form-group">
@@ -247,7 +272,11 @@
 </section>
 {% endblock %}
 {% block extrascripts %}
-<!-- TODO: add password and password confirmation comparisson check -->
+
+{% assets "js_validation" -%}
+  <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+{%- endassets %}
+
 <script>
 
     $(function() {
@@ -262,10 +291,148 @@
         $('#tabs li:eq('+activeTabIdx+')').tab('show')
     });
 
-    // initialize pretty checkboxes
-    $('.checkbox').iCheck({
+    // START: General tab js
+    $('#local_db_enabled').iCheck({
         checkboxClass : 'icheckbox_square-blue',
         increaseArea : '20%'
+    })
+
+    $('#signup_enabled').iCheck({
+        checkboxClass : 'icheckbox_square-blue',
+        increaseArea : '20%'
+    })
+    // END: General tab js
+
+    // START: LDAP tab js
+    // update validation requirement when checkbox is togged
+    $('#ldap_enabled').iCheck({
+        checkboxClass : 'icheckbox_square-blue',
+        increaseArea : '20%'
+    }).on('ifChanged', function(e) {
+        var is_enabled = e.currentTarget.checked;
+        if (is_enabled){
+            $('#ldap_uri').prop('required', true);
+            $('#ldap_base_dn').prop('required', true);
+            $('#ldap_admin_username').prop('required', true);
+            $('#ldap_admin_password').prop('required', true);
+            $('#ldap_filter_basic').prop('required', true);
+            $('#ldap_filter_username').prop('required', true);
+
+            if ($('#ldap_sg_on').is(":checked")) {
+                $('#ldap_admin_group').prop('required', true);
+                $('#ldap_user_group').prop('required', true);
+            }
+
+        } else {
+            $('#ldap_uri').prop('required', false);
+            $('#ldap_base_dn').prop('required', false);
+            $('#ldap_admin_username').prop('required', false);
+            $('#ldap_admin_password').prop('required', false);
+            $('#ldap_filter_basic').prop('required', false);
+            $('#ldap_filter_username').prop('required', false);
+
+            if ($('#ldap_sg_on').is(":checked")) {
+                $('#ldap_admin_group').prop('required', false);
+                $('#ldap_user_group').prop('required', false);
+            }
+        }
     });
+
+    $("input[name='ldap_sg_enabled']" ).change(function(){
+        if ($('#ldap_sg_on').is(":checked") && $('#ldap_enabled').is(":checked")) {
+            $('#ldap_admin_group').prop('required', true);
+            $('#ldap_user_group').prop('required', true);
+        } else {
+            $('#ldap_admin_group').prop('required', false);
+            $('#ldap_user_group').prop('required', false);
+        }
+    });
+
+    // init validation reqirement at first time page load
+    {% if SETTING.get('ldap_enabled') %}
+        $('#ldap_uri').prop('required', true);
+        $('#ldap_base_dn').prop('required', true);
+        $('#ldap_admin_username').prop('required', true);
+        $('#ldap_admin_password').prop('required', true);
+        $('#ldap_filter_basic').prop('required', true);
+        $('#ldap_filter_username').prop('required', true);
+
+        if ($('#ldap_sg_on').is(":checked")) {
+            $('#ldap_admin_group').prop('required', true);
+            $('#ldap_user_group').prop('required', true);
+        }
+    {% endif %}
+    // END: LDAP tab js
+
+    // START: Google tab js
+    // update validation requirement when checkbox is togged
+    $('#google_oauth_enabled').iCheck({
+        checkboxClass : 'icheckbox_square-blue',
+        increaseArea : '20%'
+    }).on('ifChanged', function(e) {
+        var is_enabled = e.currentTarget.checked;
+        if (is_enabled){
+            $('#google_oauth_client_id').prop('required', true);
+            $('#google_oauth_client_secret').prop('required', true);
+            $('#google_token_url').prop('required', true);
+            $('#google_token_params').prop('required', true);
+            $('#google_authorize_url').prop('required', true);
+            $('#google_base_url').prop('required', true);
+        } else {
+            $('#google_oauth_client_id').prop('required', false);
+            $('#google_oauth_client_secret').prop('required', false);
+            $('#google_token_url').prop('required', false);
+            $('#google_token_params').prop('required', false);
+            $('#google_authorize_url').prop('required', false);
+            $('#google_base_url').prop('required', false);
+        }
+    });
+
+    // init validation reqirement at first time page load
+    {% if SETTING.get('google_oauth_enabled') %}
+        $('#google_oauth_client_id').prop('required', true);
+        $('#google_oauth_client_secret').prop('required', true);
+        $('#google_token_url').prop('required', true);
+        $('#google_token_params').prop('required', true);
+        $('#google_authorize_url').prop('required', true);
+        $('#google_base_url').prop('required', true);
+    {% endif %}
+    // END: Google tab js
+
+    // START: Github tab js
+    // update validation requirement when checkbox is togged
+    $('#github_oauth_enabled').iCheck({
+        checkboxClass : 'icheckbox_square-blue',
+        increaseArea : '20%'
+    }).on('ifChanged', function(e) {
+        var is_enabled = e.currentTarget.checked;
+        if (is_enabled){
+            $('#github_oauth_key').prop('required', true);
+            $('#github_oauth_secret').prop('required', true);
+            $('#github_oauth_scope').prop('required', true);
+            $('#github_oauth_api_url').prop('required', true);
+            $('#github_oauth_token_url').prop('required', true);
+            $('#github_oauth_authorize_url').prop('required', true);
+        } else {
+            $('#github_oauth_key').prop('required', false);
+            $('#github_oauth_secret').prop('required', false);
+            $('#github_oauth_scope').prop('required', false);
+            $('#github_oauth_api_url').prop('required', false);
+            $('#github_oauth_token_url').prop('required', false);
+            $('#github_oauth_authorize_url').prop('required', false);
+        }
+    });
+
+    // init validation reqirement at first time page load
+    {% if SETTING.get('google_oauth_enabled') %}
+        $('#github_oauth_key').prop('required', true);
+        $('#github_oauth_secret').prop('required', true);
+        $('#github_oauth_scope').prop('required', true);
+        $('#github_oauth_api_url').prop('required', true);
+        $('#github_oauth_token_url').prop('required', true);
+        $('#github_oauth_authorize_url').prop('required', true);
+    {% endif %}
+    // END: Github tab js
+
 </script>
 {% endblock %}
diff --git a/app/views.py b/app/views.py
index 335ca27..3800f70 100644
--- a/app/views.py
+++ b/app/views.py
@@ -1383,23 +1383,36 @@ def admin_setting_authentication():
         return render_template('admin_setting_authentication.html')
     elif request.method == 'POST':
         conf_type = request.form.get('config_tab')
+        result = None
+
         if conf_type == 'general':
             local_db_enabled = True if request.form.get('local_db_enabled') else False
             signup_enabled = True if request.form.get('signup_enabled', ) else False
-            Setting().set('local_db_enabled', local_db_enabled)
-            Setting().set('signup_enabled', signup_enabled)
+
+            if not local_db_enabled and not Setting().get('ldap_enabled'):
+                result = {'status': False, 'msg': 'Local DB and LDAP Authentication can not be disabled at the same time.'}
+            else:
+                Setting().set('local_db_enabled', local_db_enabled)
+                Setting().set('signup_enabled', signup_enabled)
+                result = {'status': True, 'msg': 'Saved successfully'}
         elif conf_type == 'ldap':
-            Setting().set('ldap_enabled', True if request.form.get('ldap_enabled') else False)
-            Setting().set('ldap_type', request.form.get('ldap_type'))
-            Setting().set('ldap_uri', request.form.get('ldap_uri'))
-            Setting().set('ldap_base_dn', request.form.get('ldap_base_dn'))
-            Setting().set('ldap_admin_username', request.form.get('ldap_admin_username'))
-            Setting().set('ldap_admin_password', request.form.get('ldap_admin_password'))
-            Setting().set('ldap_filter_basic', request.form.get('ldap_filter_basic'))
-            Setting().set('ldap_filter_username', request.form.get('ldap_filter_username'))
-            Setting().set('ldap_sg_enabled', True if request.form.get('ldap_sg_enabled')=='ON' else False)
-            Setting().set('ldap_admin_group', request.form.get('ldap_admin_group'))
-            Setting().set('ldap_user_group', request.form.get('ldap_user_group'))
+            ldap_enabled = True if request.form.get('ldap_enabled') else False
+
+            if not ldap_enabled and not Setting().get('local_db_enabled'):
+                result = {'status': False, 'msg': 'Local DB and LDAP Authentication can not be disabled at the same time.'}
+            else:
+                Setting().set('ldap_enabled', ldap_enabled)
+                Setting().set('ldap_type', request.form.get('ldap_type'))
+                Setting().set('ldap_uri', request.form.get('ldap_uri'))
+                Setting().set('ldap_base_dn', request.form.get('ldap_base_dn'))
+                Setting().set('ldap_admin_username', request.form.get('ldap_admin_username'))
+                Setting().set('ldap_admin_password', request.form.get('ldap_admin_password'))
+                Setting().set('ldap_filter_basic', request.form.get('ldap_filter_basic'))
+                Setting().set('ldap_filter_username', request.form.get('ldap_filter_username'))
+                Setting().set('ldap_sg_enabled', True if request.form.get('ldap_sg_enabled')=='ON' else False)
+                Setting().set('ldap_admin_group', request.form.get('ldap_admin_group'))
+                Setting().set('ldap_user_group', request.form.get('ldap_user_group'))
+                result = {'status': True, 'msg': 'Saved successfully'}
         elif conf_type == 'google':
             Setting().set('google_oauth_enabled', True if request.form.get('google_oauth_enabled') else False)
             Setting().set('google_oauth_client_id', request.form.get('google_oauth_client_id'))
@@ -1408,7 +1421,7 @@ def admin_setting_authentication():
             Setting().set('google_token_params', request.form.get('google_token_params'))
             Setting().set('google_authorize_url', request.form.get('google_authorize_url'))
             Setting().set('google_base_url', request.form.get('google_base_url'))
-
+            result = {'status': True, 'msg': 'Saved successfully'}
         elif conf_type == 'github':
             Setting().set('github_oauth_enabled', True if request.form.get('github_oauth_enabled') else False)
             Setting().set('github_oauth_key', request.form.get('github_oauth_key'))
@@ -1417,11 +1430,11 @@ def admin_setting_authentication():
             Setting().set('github_oauth_api_url', request.form.get('github_oauth_api_url'))
             Setting().set('github_oauth_token_url', request.form.get('github_oauth_token_url'))
             Setting().set('github_oauth_authorize_url', request.form.get('github_oauth_authorize_url'))
+            result = {'status': True, 'msg': 'Saved successfully'}
         else:
             return abort(400)
 
-        setting = Setting().get_view('authentication')
-        return render_template('admin_setting_authentication.html', setting=setting)
+        return render_template('admin_setting_authentication.html', result=result)
 
 
 @app.route('/user/profile', methods=['GET', 'POST'])
diff --git a/package.json b/package.json
index 6b8d78c..939b50a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "admin-lte": "2.4.3",
+    "bootstrap-validator": "^0.11.9",
     "icheck": "^1.0.2",
     "jquery-slimscroll": "^1.3.8",
     "jquery-ui-dist": "^1.12.1",
diff --git a/yarn.lock b/yarn.lock
index 400bd76..b7ed3b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -132,6 +132,10 @@ bootstrap-timepicker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz#10ed9f2a2f0b8ccaefcde0fcf6a0738b919a3835"
 
+bootstrap-validator@^0.11.9:
+  version "0.11.9"
+  resolved "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz#fb7058eef53623e78f5aa7967026f98f875a9404"
+
 bootstrap@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"