diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index 2f8dbc0..18063cf 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -214,14 +214,23 @@
         "ordering" : false,
         "info" : false,
         "autoWidth" : false
-    });
+    });   
+    // set up domain list
     $("#tbl_domain_list").DataTable({
         "paging" : true,
         "lengthChange" : true,
         "searching" : true,
         "ordering" : true,
         "info" : false,
-        "autoWidth" : false
+        "autoWidth" : false,
+	    {% if default_domain_table_size_setting in ['10','25','50','100'] %}
+	    "lengthMenu": [ [10, 25, 50, 100, -1],
+	                    [10, 25, 50, 100, "All"]],
+	    {% else %}
+	    "lengthMenu": [ [10, 25, 50, 100, {{ default_domain_table_size_setting }}, -1],
+	                    [10, 25, 50, 100, {{ default_domain_table_size_setting }}, "All"]],
+	    {% endif %}
+	    "pageLength": {{ default_domain_table_size_setting }}
     });
     $(document.body).on('click', '.history-info-button', function() {
         var modal = $("#modal_history_info");
diff --git a/app/templates/login.html b/app/templates/login.html
index 9cf3030..a495f24 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -63,8 +63,12 @@
                     <div class="form-group">
               <select class="form-control" name="auth_method">
                         <option value="LOCAL">LOCAL Authentication</option>
-                        <option value="LDAP">LDAP Authentication</option>
-                      </select>
+						{% if login_ldap_first_setting %}
+                        <option value="LDAP" selected="selected">LDAP Authentication</option>
+						{% else %}
+						<option value="LDAP">LDAP Authentication</option>
+						{% endif %}
+              </select>
             </div>      
             {% elif ldap_enabled and not basic_enabled %}
             <div class="form-group">
diff --git a/app/views.py b/app/views.py
index a1604ce..8675e3e 100644
--- a/app/views.py
+++ b/app/views.py
@@ -41,11 +41,21 @@ def inject_record_helper_setting():
     record_helper_setting = Setting.query.filter(Setting.name == 'record_helper').first()
     return dict(record_helper_setting=strtobool(record_helper_setting.value))
 
+@app.context_processor
+def inject_login_ldap_first_setting():
+    login_ldap_first_setting = Setting.query.filter(Setting.name == 'login_ldap_first').first()
+    return dict(login_ldap_first_setting=strtobool(login_ldap_first_setting.value))
+
 @app.context_processor
 def inject_default_record_table_size_setting():
     default_record_table_size_setting = Setting.query.filter(Setting.name == 'default_record_table_size').first()
     return dict(default_record_table_size_setting=default_record_table_size_setting.value)
 
+@app.context_processor
+def inject_default_domain_table_size_setting():
+    default_domain_table_size_setting = Setting.query.filter(Setting.name == 'default_domain_table_size').first()
+    return dict(default_domain_table_size_setting=default_domain_table_size_setting.value)
+
 # START USER AUTHENTICATION HANDLER
 @app.before_request
 def before_request():
diff --git a/create_db.py b/create_db.py
index a82d228..c004749 100755
--- a/create_db.py
+++ b/create_db.py
@@ -12,13 +12,17 @@ user_role = Role('User', 'User')
 maintenance_setting = Setting('maintenance', 'False')
 fullscreen_layout_setting = Setting('fullscreen_layout', 'True')
 record_helper_setting = Setting('record_helper', 'True')
-default_table_size_setting = Setting('default_record_table_size', '15')
+login_ldap_first_setting = Setting('login_ldap_first', 'True')
+default_record_table_size_setting = Setting('default_record_table_size', '15')
+default_domain_table_size_setting = Setting('default_domain_table_size', '10')
 db.session.add(admin_role)
 db.session.add(user_role)
 db.session.add(maintenance_setting)
 db.session.add(fullscreen_layout_setting)
 db.session.add(record_helper_setting)
-db.session.add(default_table_size_setting)
+db.session.add(login_ldap_first_setting)
+db.session.add(default_record_table_size_setting)
+db.session.add(default_domain_table_size_setting)
 db.session.commit()
 if not os.path.exists(SQLALCHEMY_MIGRATE_REPO):
     api.create(SQLALCHEMY_MIGRATE_REPO, 'database repository')