diff --git a/webui/controller/customer/list.php b/webui/controller/customer/list.php
index cec7916b..7cf2fd4e 100644
--- a/webui/controller/customer/list.php
+++ b/webui/controller/customer/list.php
@@ -35,44 +35,56 @@ class ControllerCustomerList extends Controller {
       if(isset($this->request->get['id'])) { $this->data['id'] = $this->request->get['id']; }
 
       /* check if we are admin */
-
+      
       if(Registry::get('admin_user') == 1) {
 
          if($this->request->server['REQUEST_METHOD'] == 'POST') {
             if($this->validate() == true) {
-
+            
                if(isset($this->request->post['id'])) {
                   if($this->model_saas_customer->update($this->request->post) == 1) {
                      $this->data['x'] = $this->data['text_successfully_modified'];
                   } else {
-                     $this->template = "common/error.tpl";
                      $this->data['errorstring'] = $this->data['text_failed_to_modify'];
+                     // set customer ID to be the submitted id
+                     if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
                   }
                }
                else {
                   if($this->model_saas_customer->add($this->request->post) == 1) {
                      $this->data['x'] = $this->data['text_successfully_added'];
                   } else {
-                     $this->template = "common/error.tpl";
                      $this->data['errorstring'] = $this->data['text_failed_to_add'];
                   }
                }
             }
-            else {
-               $this->template = "common/error.tpl";
-               $this->data['errorstring'] = array_pop($this->error);
+            else {            
+                $this->data['errorstring'] = $this->data['text_error_message'];
+                $this->data['errors'] = $this->error;
+                // set customer ID to be the submitted id
+                if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; print_r($this->data['id']);}
             } 
          }
 
          $this->data['domains'] = $this->model_domain_domain->get_mapped_domains();
 
-         if(isset($this->request->get['id'])) {
-            $this->data['a'] = $this->model_saas_customer->get($this->request->get['id']);
+         if($this->data['id'] != -1) {
+            $this->data['a'] = $this->model_saas_customer->get($this->data['id']);  
          }
          else {
             $this->data['entries'] = $this->model_saas_customer->get();
          }
-
+         
+         if ( isset($this->data['errorstring']) ) {
+            // use posted values if they differ from database values (ie - form was submitted but failed validation)
+            if (isset($this->request->post['domain'])) { $this->data['a']['domain'] = $this->request->post['domain'];}
+            if (isset($this->request->post['branding_text'])) { $this->data['a']['branding_text'] = $this->request->post['branding_text'];}
+            if (isset($this->request->post['branding_url'])) { $this->data['a']['branding_url'] = $this->request->post['branding_url'];}
+            if (isset($this->request->post['branding_logo'])) { $this->data['a']['branding_logo'] = $this->request->post['branding_logo'];}
+            if (isset($this->request->post['support_link'])) { $this->data['a']['support_link'] = $this->request->post['support_link'];}
+            if (isset($this->request->post['colour'])) { $this->data['a']['colour'] = $this->request->post['colour'];}
+         }
+         
       }
       else {
          $this->template = "common/error.tpl";
@@ -85,15 +97,19 @@ class ControllerCustomerList extends Controller {
 
 
    private function validate() {
-
+      // domain is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['domain']) || strlen($this->request->post['domain']) < 1) {
          $this->error['domain'] = $this->data['text_invalid_data'];
       }
-
+      // branding text is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['branding_text']) || strlen($this->request->post['branding_text']) < 1) {
-         $this->error['branding_text'] = $this->data['text_invalid_data'];
+         $this->error['branding_text'] = $this->data['text_field_required'];
       }
-
+      // if colour is provided it must be in the format #fcfcfc or #fcf
+      if(isset($this->request->post['colour']) && strlen($this->request->post['colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['colour'])) {
+         $this->error['colour'] = $this->data['text_field_colour'];
+      }
+      
       if (!$this->error) {
          return true;
       } else {
diff --git a/webui/controller/customer/remove.php b/webui/controller/customer/remove.php
index ca28870c..d8e02a8b 100644
--- a/webui/controller/customer/remove.php
+++ b/webui/controller/customer/remove.php
@@ -24,7 +24,7 @@ class ControllerCustomerRemove extends Controller {
       $this->data['username'] = Registry::get('username');
 
       $this->data['id'] = $this->request->get['id'];
-      $this->data['domain'] = $this->request->get['domain'];
+      $this->data['domain'] = $this->request->get['name'];
       $this->data['confirmed'] = (int)$this->request->get['confirmed'];
 
 
@@ -57,7 +57,7 @@ class ControllerCustomerRemove extends Controller {
          $this->error['admin'] = $this->data['text_you_are_not_admin'];
       }
 
-      if(!isset($this->request->get['domain']) || strlen($this->request->get['domain']) < 1) {
+      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 1) {
          $this->error['domain'] = $this->data['text_invalid_data'];
       }
 
diff --git a/webui/controller/domain/domain.php b/webui/controller/domain/domain.php
index e2597ff0..302c191b 100644
--- a/webui/controller/domain/domain.php
+++ b/webui/controller/domain/domain.php
@@ -21,7 +21,11 @@ class ControllerDomainDomain extends Controller {
       if(ENABLE_SAAS == 1) {
          $this->load->model('saas/ldap');
          $this->data['ldap'] = $this->model_saas_ldap->get();
-         $ldap_id = $this->request->post['ldap_id'];
+         if ( isset($this->request->post['ldap_id']) ) {
+            $ldap_id = $this->request->post['ldap_id'];
+         } else {
+            $ldap_id = 0;
+         }
       }
 
       $this->document->title = $this->data['text_domain'];
diff --git a/webui/controller/domain/remove.php b/webui/controller/domain/remove.php
index 459f7a53..8c873beb 100644
--- a/webui/controller/domain/remove.php
+++ b/webui/controller/domain/remove.php
@@ -56,7 +56,7 @@ class ControllerDomainRemove extends Controller {
          $this->error['admin'] = $this->data['text_you_are_not_admin'];
       }
 
-      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['domain'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) {
+      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) {
          $this->error['domain'] = $this->data['text_invalid_data'];
       }
 
diff --git a/webui/controller/ldap/list.php b/webui/controller/ldap/list.php
index b0eee06d..92f6bc73 100644
--- a/webui/controller/ldap/list.php
+++ b/webui/controller/ldap/list.php
@@ -46,22 +46,24 @@ class ControllerLdapList extends Controller {
                   if($this->model_saas_ldap->update($this->request->post) == 1) {
                      $this->data['x'] = $this->data['text_successfully_modified'];
                   } else {
-                     $this->template = "common/error.tpl";
                      $this->data['errorstring'] = $this->data['text_failed_to_modify'];
+                     // set ldap ID to be the submitted id
+                     if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
                   }
                }
                else {
                   if($this->model_saas_ldap->add($this->request->post) == 1) {
                      $this->data['x'] = $this->data['text_successfully_added'];
                   } else {
-                     $this->template = "common/error.tpl";
                      $this->data['errorstring'] = $this->data['text_failed_to_add'];
                   }
                }
             }
             else {
-               $this->template = "common/error.tpl";
-               $this->data['errorstring'] = array_pop($this->error);
+                $this->data['errorstring'] = $this->data['text_error_message'];
+                $this->data['errors'] = $this->error;
+               // set ldap ID to be the submitted id
+               if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
             } 
          }
 
@@ -71,7 +73,13 @@ class ControllerLdapList extends Controller {
          else {
             $this->data['entries'] = $this->model_saas_ldap->get();
          }
-
+         
+         if ( isset($this->data['errorstring']) ) {
+            // use posted values if they differ from database values (ie - form was submitted but failed validation)
+            if (isset($this->request->post['ldap_type'])) { $this->data['a']['ldap_type'] = $this->request->post['ldap_type'];}
+            if (isset($this->request->post['description'])) { $this->data['a']['description'] = $this->request->post['description'];}
+         }
+         
       }
       else {
          $this->template = "common/error.tpl";
@@ -84,25 +92,25 @@ class ControllerLdapList extends Controller {
 
 
    private function validate() {
-
+      // description is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['description']) || strlen($this->request->post['description']) < 1) {
-         $this->error['description'] = $this->data['text_invalid_data'];
+         $this->error['description'] = $this->data['text_field_required'];
       }
-
+      // ldap_host is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['ldap_host']) || strlen($this->request->post['ldap_host']) < 1) {
-         $this->error['ldap_host'] = $this->data['text_invalid_data'];
+         $this->error['ldap_host'] = $this->data['text_field_required'];
       }
-
+      // ldap_base_dn is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['ldap_base_dn']) || strlen($this->request->post['ldap_base_dn']) < 1) {
-         $this->error['ldap_base_dn'] = $this->data['text_invalid_data'];
+         $this->error['ldap_base_dn'] = $this->data['text_field_required'];
       }
-
+      // ldap_bind_dn is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['ldap_bind_dn']) || strlen($this->request->post['ldap_bind_dn']) < 1) {
-         $this->error['ldap_bind_dn'] = $this->data['text_invalid_data'];
+         $this->error['ldap_bind_dn'] = $this->data['text_field_required'];
       }
-
+      // ldap_bind_pw is required and must be 1 or more characters in length to meet this
       if(!isset($this->request->post['ldap_bind_pw']) || strlen($this->request->post['ldap_bind_pw']) < 1) {
-         $this->error['ldap_bind_pw'] = $this->data['text_invalid_data'];
+         $this->error['ldap_bind_pw'] = $this->data['text_field_required'];
       }
 
       if (!$this->error) {
diff --git a/webui/controller/ldap/remove.php b/webui/controller/ldap/remove.php
index 4f942a41..f5efccda 100644
--- a/webui/controller/ldap/remove.php
+++ b/webui/controller/ldap/remove.php
@@ -24,7 +24,7 @@ class ControllerLdapRemove extends Controller {
       $this->data['username'] = Registry::get('username');
 
       $this->data['id'] = $this->request->get['id'];
-      $this->data['description'] = $this->request->get['description'];
+      $this->data['description'] = $this->request->get['name'];
       $this->data['confirmed'] = (int)$this->request->get['confirmed'];
 
 
@@ -57,7 +57,7 @@ class ControllerLdapRemove extends Controller {
          $this->error['admin'] = $this->data['text_you_are_not_admin'];
       }
 
-      if(!isset($this->request->get['description']) || strlen($this->request->get['description']) < 1) {
+      if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 1) {
          $this->error['description'] = $this->data['text_invalid_data'];
       }
 
diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php
index a9a9c413..3f519e17 100644
--- a/webui/language/en/messages.php
+++ b/webui/language/en/messages.php
@@ -437,9 +437,13 @@ $_['text_error_message'] = 'Please correct the below errors and re-submit.';
 $_['text_field_required'] = 'This field is required.';
 $_['text_field_length'] = 'This field is required to be longer than ? characters.';
 $_['text_field_domain'] = 'This field must be a valid domain (ie - domain.com).';
+$_['text_field_colour'] = 'This field must be a valid color code (ie - #fcfcfc).';
 $_['text_delete'] = 'Delete';
 $_['text_confirm'] = 'Confirm';
 $_['text_user_delete_confirm_message'] = 'Do you wish to delete the user';
 $_['text_domain_delete_confirm_message'] = 'Do you wish to delete the domain';
+$_['text_group_delete_confirm_message'] = 'Do you wish to delete the group';
+$_['text_ldap_delete_confirm_message'] = 'Do you wish to delete the LDAP entry';
+$_['text_customer_delete_confirm_message'] = 'Do you wish to delete the customer';
 $_['text_with_selected'] = 'With Selected';
 ?>
diff --git a/webui/model/saas/customer.php b/webui/model/saas/customer.php
index 5b21d505..87bccd63 100644
--- a/webui/model/saas/customer.php
+++ b/webui/model/saas/customer.php
@@ -36,7 +36,7 @@ class ModelSaasCustomer extends Model
 
       if(!isset($arr['domain']) || !isset($arr['branding_text'])) { return 0; }
 
-      if(isset($_FILES['branding_logo']['name'])) {
+      if(isset($_FILES['branding_logo']['name']) && strlen($_FILES['branding_logo']['name'])>0) {
          $branding_logo = $_FILES['branding_logo']['name'];
          move_uploaded_file($_FILES['branding_logo']['tmp_name'], DIR_BASE . "/images/" . $_FILES['branding_logo']['name']);
       }
@@ -55,10 +55,10 @@ class ModelSaasCustomer extends Model
 
    public function update($arr = array()) {
       $branding_logo = '';
-
+      
       if(!isset($arr['id']) || !isset($arr['domain']) || !isset($arr['branding_text'])) { return 0; }
 
-      if(isset($_FILES['branding_logo']['name'])) {
+      if(isset($_FILES['branding_logo']['name']) && strlen($_FILES['branding_logo']['name'])>0) {
          $branding_logo = $_FILES['branding_logo']['name'];
          move_uploaded_file($_FILES['branding_logo']['tmp_name'], DIR_BASE . "/images/" . $_FILES['branding_logo']['name']);
 
diff --git a/webui/view/javascript/piler-in.js b/webui/view/javascript/piler-in.js
index c1c497a9..c65cb89b 100644
--- a/webui/view/javascript/piler-in.js
+++ b/webui/view/javascript/piler-in.js
@@ -1085,7 +1085,7 @@ $(document).on("click", ".confirm-delete", function (e) {
      //set id
      url = UpdateQueryString('id',id,url);
      //set name
-     url = UpdateQueryString('name',name,url);
+     url = UpdateQueryString('name',encodeURIComponent(name),url);
      //set confirmation
      url = UpdateQueryString('confirmed',1,url);
      //set href
diff --git a/webui/view/theme/default/templates/common/menu.tpl b/webui/view/theme/default/templates/common/menu.tpl
index b2a34f4e..1f110137 100644
--- a/webui/view/theme/default/templates/common/menu.tpl
+++ b/webui/view/theme/default/templates/common/menu.tpl
@@ -63,11 +63,17 @@
                 </ul>
             
                 <ul class="nav pull-right">
-		<?php if($settings['branding_url']) { ?><li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><i class="icon-phone"></i>&nbsp;<?php print $settings['branding_text']; ?></a></li><?php } ?>
+	<?php if($settings['branding_url']) { ?>
+                    <li><a href="<?php print $settings['branding_url']; ?>" target="_blank"><i class="icon-phone"></i>&nbsp;<?php print $settings['branding_text']; ?></a></li>
+    <?php } ?>
 
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i>&nbsp;<?php if(isset($_SESSION['realname'])) { print $_SESSION['realname']; ?>&nbsp;<?php } ?><b class="caret"></b></a>
                         <ul class="dropdown-menu">
+    <?php if($settings['support_link']) { ?>
+                            <li><a href="<?php print $settings['support_link']; ?>" target="_blank"><i class="icon-question-sign"></i>&nbsp;<?php print $text_contact_support; ?></a></li>
+                            <li class="divider"></li>
+    <?php } ?>
                             <li><a href="settings.php"><i class="icon-cog"></i>&nbsp;Settings</a></li>
                             <li class="divider"></li>
                             <li><a href="logout.php"><i class="icon-off"></i>&nbsp;<?php print $text_logout; ?></a></li>
diff --git a/webui/view/theme/default/templates/customer/list.tpl b/webui/view/theme/default/templates/customer/list.tpl
index 4c58091d..9de64ffc 100644
--- a/webui/view/theme/default/templates/customer/list.tpl
+++ b/webui/view/theme/default/templates/customer/list.tpl
@@ -1,16 +1,31 @@
-<h4><?php if(isset($a['domain'])) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
+<div id="deleteconfirm-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
+  </div>
+  <div class="modal-body">
+    <p><?php print $text_customer_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="index.php?route=customer/remove&amp;id=-1&amp;name=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
+  </div>
+</div>
 
+<h4><?php if(isset($id) && ($id > 0)) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
+
+<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
 <?php if(isset($x)){ ?>
-    <div class="alert alert-info"><?php print $x; ?></div>
+    <div class="alert alert-success"><?php print $x; ?></div>
 <?php } ?>
 
 <form method="post" name="add1" action="index.php?route=customer/list" class="form-horizontal" enctype="multipart/form-data">
 
- <?php if(isset($a['domain'])) { ?>
+ <?php if(isset($id) && ($id > 0)) { ?>
     <input type="hidden" name="id" id="id" value="<?php print $id; ?>" />
  <?php } ?>
 
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['domain'])){ print " error"; } ?>">
        <label class="control-label" for="domain"><?php print $text_domain; ?>:</label>
        <div class="controls">
           <select name="domain" id="domain">
@@ -20,40 +35,49 @@
           </select>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['branding_text'])){ print " error"; } ?>">
        <label class="control-label" for="branding_text"><?php print $text_branding_text; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="branding_text" id="branding_text" placeholder="" value="<?php if(isset($a['branding_text'])) { print $a['branding_text']; } ?>" />
+          <?php if ( isset($errors['branding_text']) ) { ?><span class="help-inline"><?php print $errors['branding_text']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['branding_url'])){ print " error"; } ?>">
        <label class="control-label" for="branding_url"><?php print $text_branding_url; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="branding_url" id="branding_url" placeholder="" value="<?php if(isset($a['branding_url'])) { print $a['branding_url']; } ?>" />
+          <?php if ( isset($errors['branding_url']) ) { ?><span class="help-inline"><?php print $errors['branding_url']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['branding_logo'])){ print " error"; } ?>">
        <label class="control-label" for="branding_logo"><?php print $text_branding_logo; ?>:</label>
        <div class="controls">
-          <input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" /> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
+          <input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" value="<?php if(isset($a['branding_logo'])) { print $a['branding_logo']; } ?>"/> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
+          <?php if ( isset($errors['branding_logo']) ) { ?><span class="help-inline"><?php print $errors['branding_logo']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['support_link'])){ print " error"; } ?>">
        <label class="control-label" for="support_link"><?php print $text_support_link; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="support_link" id="support_link" placeholder="" value="<?php if(isset($a['support_link'])) { print $a['support_link']; } ?>" />
+          <?php if ( isset($errors['support_link']) ) { ?><span class="help-inline"><?php print $errors['support_link']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['colour'])){ print " error"; } ?>">
        <label class="control-label" for="colour"><?php print $text_colour; ?>:</label>
        <div class="controls">
-          <input type="text" class="text" name="colour" id="colour" placeholder="" value="<?php if(isset($a['colour'])) { print $a['colour']; } ?>" oninput="Piler.change_box_colour();" /> <span id="cp" style="<?php if(isset($a['colour'])) { ?>background: <?php print $a['colour']; ?>;<?php } ?>">&nbsp;&nbsp;&nbsp;</span>
+          <input type="text" class="text" name="colour" id="colour" placeholder="" value="<?php if(isset($a['colour'])) { print $a['colour']; } ?>" oninput="Piler.change_box_colour();" /> <span id="cp" class="label" style="<?php if(isset($a['colour'])) { ?>background: <?php print $a['colour']; ?>;<?php } ?>">&nbsp;</span>
+          <?php if ( isset($errors['colour']) ) { ?><span class="help-inline"><?php print $errors['colour']; ?></span><?php } ?>
        </div>
     </div>
 
     <div class="form-actions">
-        <input type="submit" value="<?php if(isset($a['domain'])) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
-        <input type="reset" value="<?php print $text_clear; ?>" class="btn" onclick="Piler.clear_ldap_test();" />
+        <input type="submit" value="<?php if(isset($id) && ($id > 0)) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
+        <?php if(isset($id) && ($id > 0)) { ?>
+            <a href="index.php?route=customer/list" class="btn"><?php print $text_cancel; ?></a>
+        <?php } else { ?>
+            <input type="reset" value="<?php print $text_clear; ?>" class="btn" onclick="Piler.clear_ldap_test();" />
+        <?php } ?>
     </div>
 
 </form>
@@ -68,24 +92,24 @@
 
    <table id="ss1" class="table table-striped table-condensed">
       <tr>
-         <th class="domaincell"><?php print $text_domain; ?></th>
-         <th class="domaincell"><?php print $text_branding_text; ?></th>
-         <th class="domaincell"><?php print $text_branding_url; ?></th>
-         <th class="domaincell"><?php print $text_branding_logo; ?></th>
-         <th class="domaincell"><?php print $text_colour; ?></th>
-         <th class="domaincell">&nbsp;</th>
-         <th class="domaincell">&nbsp;</th>
+         <th><?php print $text_domain; ?></th>
+         <th><?php print $text_branding_text; ?></th>
+         <th><?php print $text_branding_url; ?></th>
+         <th><?php print $text_branding_logo; ?></th>
+         <th><?php print $text_colour; ?></th>
+         <th>&nbsp;</th>
+         <th>&nbsp;</th>
       </tr>
 
 <?php foreach($entries as $e) { ?>
       <tr>
-         <td class="domaincell"><?php print $e['domain']; ?></td>
-         <td class="domaincell"><?php print $e['branding_text']; ?></td>
-         <td class="domaincell"><?php print $e['branding_url']; ?></td>
-         <td class="domaincell"><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></td>
-         <td class="domaincell"><?php print $e['colour']; ?></td>
-         <td class="domaincell"><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><?php print $text_edit; ?></a></td>
-         <td class="domaincell"><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;domain=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" onclick="if(confirm('<?php print $text_remove; ?>: ' + '\'<?php print $e['domain']; ?>\'')) return true; return false;"><?php print $text_remove; ?></a></td>
+         <td><?php print $e['domain']; ?></td>
+         <td><?php print $e['branding_text']; ?></td>
+         <td><?php print $e['branding_url']; ?></td>
+         <td><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></td>
+         <td><span class="label" style="background-color:<?php print $e['colour']; ?>"><?php print $e['colour']; ?></span></td>
+         <td><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit; ?></a></td>
+         <td><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;name=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" class="confirm-delete" data-id="<?php print $e['id']; ?>" data-name="<?php print $e['domain']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
       </tr>
 <?php } ?>
 
diff --git a/webui/view/theme/default/templates/customer/remove.tpl b/webui/view/theme/default/templates/customer/remove.tpl
index e8f8c6e3..9924a0e3 100644
--- a/webui/view/theme/default/templates/customer/remove.tpl
+++ b/webui/view/theme/default/templates/customer/remove.tpl
@@ -1,11 +1,13 @@
 
-<p>
+<div>
 
 <?php if($confirmed){ ?>
 
-<?php print $x; ?>. <a href="index.php?route=customer/list"><?php print $text_back; ?></a>
+<div class="alert alert-success"><?php print $x; ?>.</div>
 
 <?php } ?>
 
-</p>
+<p><a href="index.php?route=customer/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
+
+</div>
 
diff --git a/webui/view/theme/default/templates/domain/list.tpl b/webui/view/theme/default/templates/domain/list.tpl
index e857097b..914abab6 100644
--- a/webui/view/theme/default/templates/domain/list.tpl
+++ b/webui/view/theme/default/templates/domain/list.tpl
@@ -66,7 +66,6 @@
       <tr>
          <th><?php print $text_domain; ?></th>
          <th><?php print $text_mapped_domain; ?></th>
-         <th>&nbsp;</th>
       <?php if(ENABLE_SAAS == 1) { ?>
          <th><?php print $text_ldap; ?></th>
       <?php } ?>
@@ -78,9 +77,9 @@
          <td><a href="index.php?route=user/list&search=@<?php print $domain['domain']; ?>"><?php print $domain['domain']; ?></a></td>
          <td><?php print $domain['mapped']; ?></td>
       <?php if(ENABLE_SAAS == 1) { ?>
-         <td><?php print $domain['ldap']; ?></td>
+         <td><?php if(isset($domain['ldap'])) {print $domain['ldap'];} else {print '&nbsp;';} ?></td>
       <?php } ?>
-         <td><a href="index.php?route=domain/remove&amp;id=1&amp;name=<?php print urlencode($domain['domain']); ?>" class="confirm-delete" data-id="1" data-name="<?php print urlencode($domain['domain']); ?>"><?php print $text_remove; ?></a></td>
+         <td><a href="index.php?route=domain/remove&amp;id=1&amp;name=<?php print urlencode($domain['domain']); ?>" class="confirm-delete" data-id="1" data-name="<?php print urlencode($domain['domain']); ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
       </tr>
 <?php } ?>
 
diff --git a/webui/view/theme/default/templates/group/edit.tpl b/webui/view/theme/default/templates/group/edit.tpl
index d95f578b..11b39dfd 100644
--- a/webui/view/theme/default/templates/group/edit.tpl
+++ b/webui/view/theme/default/templates/group/edit.tpl
@@ -1,3 +1,16 @@
+<div id="deleteconfirm-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
+  </div>
+  <div class="modal-body">
+    <p><?php print $text_group_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="index.php?route=group/remove&amp;id=-1&amp;name=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
+  </div>
+</div>
 
 <?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
 
@@ -8,8 +21,8 @@
 
 <?php } elseif(isset($group)) { ?>
 
-<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=group/remove&amp;id=<?php print $group['id']; ?>&amp;group=<?php print $group['groupname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_group; ?>: <?php print $group['groupname']; ?></a></p>
-
+<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | 
+<a href="index.php?route=group/remove&amp;id=<?php print $group['id']; ?>&amp;name=<?php print urlencode($group['groupname']); ?>" class="confirm-delete" data-id="<?php print $group['id']; ?>" data-name="<?php print $group['groupname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_group; ?></a></p>
 <form action="index.php?route=group/edit" name="addgroup" method="post" autocomplete="off" class="form-horizontal">
    <input type="hidden" name="id" value="<?php print $id; ?>" />
 
diff --git a/webui/view/theme/default/templates/group/email.tpl b/webui/view/theme/default/templates/group/email.tpl
index 53fd237d..72da6bb6 100644
--- a/webui/view/theme/default/templates/group/email.tpl
+++ b/webui/view/theme/default/templates/group/email.tpl
@@ -16,4 +16,4 @@
    <?php if($page < $total_pages){ ?><a href="index.php?route=group/email&amp;page=<?php print $total_pages; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-right"></i><?php if($page < $total_pages){ ?></a><?php } ?>
 </div>
 
-<div style="margin-top: 20px;"><a href="#" onclick="window.close();"><i class="icon-remove-sign"></i>&nbsp;close</a></div>
+<div style="margin-top: 20px;"><a href="#" onclick="window.close();"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_close;?></a></div>
diff --git a/webui/view/theme/default/templates/group/list.tpl b/webui/view/theme/default/templates/group/list.tpl
index 790a9d83..f311d0f8 100644
--- a/webui/view/theme/default/templates/group/list.tpl
+++ b/webui/view/theme/default/templates/group/list.tpl
@@ -1,3 +1,17 @@
+<div id="deleteconfirm-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
+  </div>
+  <div class="modal-body">
+    <p><?php print $text_group_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="index.php?route=group/remove&amp;id=-1&amp;name=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
+  </div>
+</div>
+
 <form method="post" name="search1" action="index.php?route=group/list" class="form-inline pull-right">
     <div class="input-append">
         <input type="text" name="search" class="input-medium" value="<?php print $search; ?>" />
@@ -26,15 +40,17 @@
     <table class="table table-striped table-condensed" id="ss1">
       <thead>
       <tr class="domainrow">
-         <th class="domaincell"><?php print $text_groupname; ?> <a href="index.php?route=group/list&amp;sort=groupname&amp;order=0"><i class="icon-chevron-up"></i></a>&nbsp;<a href="index.php?route=group/list&amp;sort=groupname&amp;order=1"><i class="icon-chevron-down"></i></a></th>
-         <th class="domaincell">&nbsp;</th>
+         <th><?php print $text_groupname; ?> <a href="index.php?route=group/list&amp;sort=groupname&amp;order=0"><i class="icon-chevron-up"></i></a>&nbsp;<a href="index.php?route=group/list&amp;sort=groupname&amp;order=1"><i class="icon-chevron-down"></i></a></th>
+         <th>&nbsp;</th>
+         <th>&nbsp;</th>
       </tr>
       </thead>
       <tbody>
 <?php foreach($groups as $group) { ?>
       <tr class="domainrow">
-         <td class="domaincell"><?php print $group['groupname']; ?></td>
-         <td class="domaincell"><a href="index.php?route=group/edit&amp;id=<?php print $group['id']; ?>"><?php print $text_edit_or_view; ?></a></td>
+         <td><?php print $group['groupname']; ?></td>
+         <td><a href="index.php?route=group/edit&amp;id=<?php print $group['id']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit_or_view; ?></a></td>
+         <td><a href="index.php?route=group/remove&amp;id=<?php print $group['id']; ?>&amp;name=<?php print urlencode($group['groupname']); ?>" class="confirm-delete" data-id="<?php print $group['id']; ?>" data-name="<?php print $group['groupname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
       </tr>
 <?php } ?>
       </tbody>
diff --git a/webui/view/theme/default/templates/ldap/domains.tpl b/webui/view/theme/default/templates/ldap/domains.tpl
index d25b1f6d..d0f805f4 100644
--- a/webui/view/theme/default/templates/ldap/domains.tpl
+++ b/webui/view/theme/default/templates/ldap/domains.tpl
@@ -1,8 +1,8 @@
-
+<table class="table table-striped table-condensed">
 <?php foreach($domains as $domain) { ?>
-   <a href="#" onclick="append_value_from_slider('domains', '<?php print $domain['domain']; ?>');"><?php print $domain['domain']; ?></a><br />
+   <tr><td><a href="#" onclick="append_value_from_slider('domains', '<?php print $domain['domain']; ?>');"><?php print $domain['domain']; ?></a></td></tr>
 <?php } ?>
-
+</table>
 
 <div id="pagenav">
    <?php if($page > 0){ ?><a href="index.php?route=domain/domains&amp;page=0&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
@@ -16,4 +16,4 @@
    <?php if($page < $total_pages){ ?><a href="index.php?route=domain/domains&amp;page=<?php print $total_pages; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
 </div>
 
-<div class="top20px"><a href="#" onclick="window.close();">close</a></div>
+<div class="top20px"><a href="#" onclick="window.close();"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_close;?></a></div>
diff --git a/webui/view/theme/default/templates/ldap/list.tpl b/webui/view/theme/default/templates/ldap/list.tpl
index 72cca0fa..b7f6e074 100644
--- a/webui/view/theme/default/templates/ldap/list.tpl
+++ b/webui/view/theme/default/templates/ldap/list.tpl
@@ -1,16 +1,31 @@
-<h4><?php if(isset($a['description'])) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
+<div id="deleteconfirm-modal" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
+    <h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
+  </div>
+  <div class="modal-body">
+    <p><?php print $text_ldap_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
+    <a href="index.php?route=ldap/remove&amp;id=-1&amp;name=Error&amp;confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
+  </div>
+</div>
 
+<h4><?php if(isset($id) && ($id > 0)) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
+
+<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
 <?php if(isset($x)){ ?>
-    <div class="alert alert-info"><?php print $x; ?></div>
+    <div class="alert alert-success"><?php print $x; ?></div>
 <?php } ?>
 
 <form method="post" name="add1" action="index.php?route=ldap/list" class="form-horizontal">
 
- <?php if(isset($a['description'])) { ?>
+ <?php if(isset($id) && ($id > 0)) { ?>
     <input type="hidden" name="id" id="id" value="<?php print $id; ?>" />
  <?php } ?>
 
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['ldap_type'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_type"><?php print $text_ldap_type; ?>:</label>
        <div class="controls">
           <select name="ldap_type" id="ldap_type">
@@ -20,46 +35,56 @@
           </select>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['description'])){ print " error"; } ?>">
 		<label class="control-label" for="description"><?php print $text_description; ?>:</label>
         <div class="controls">
             <input type="text" class="text" name="description" id="description" placeholder="" value="<?php if(isset($a['description'])) { print $a['description']; } ?>" />
+            <?php if ( isset($errors['description']) ) { ?><span class="help-inline"><?php print $errors['description']; ?></span><?php } ?>
         </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['ldap_host'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_host"><?php print $text_ldap_host; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="ldap_host" id="ldap_host" placeholder="" value="<?php if(isset($a['ldap_host'])) { print $a['ldap_host']; } ?>" />
+          <?php if ( isset($errors['ldap_host']) ) { ?><span class="help-inline"><?php print $errors['ldap_host']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['ldap_base_dn'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_base_dn"><?php print $text_ldap_base_dn; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="ldap_base_dn" id="ldap_base_dn" placeholder="" value="<?php if(isset($a['ldap_base_dn'])) { print $a['ldap_base_dn']; } ?>" />
+          <?php if ( isset($errors['ldap_base_dn']) ) { ?><span class="help-inline"><?php print $errors['ldap_base_dn']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['ldap_bind_dn'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_bind_dn"><?php print $text_ldap_bind_dn; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="ldap_bind_dn" id="ldap_bind_dn" placeholder="" value="<?php if(isset($a['ldap_bind_dn'])) { print $a['ldap_bind_dn']; } ?>" />
+          <?php if ( isset($errors['ldap_bind_dn']) ) { ?><span class="help-inline"><?php print $errors['ldap_bind_dn']; ?></span><?php } ?>
        </div>
     </div>
-    <div class="control-group">
+    <div class="control-group<?php if(isset($errors['ldap_bind_pw'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_bind_pw"><?php print $text_ldap_bind_pw; ?>:</label>
        <div class="controls">
           <input type="password" class="password" name="ldap_bind_pw" id="ldap_bind_pw" placeholder="" value="<?php if(isset($a['ldap_bind_pw'])) { print $a['ldap_bind_pw']; } ?>" /> <input type="button" value="<?php print $text_test_connection; ?>" class="btn btn-danger" onclick="Piler.test_ldap_connection(); return false;" /> <span id="LDAPTEST"></span>
+          <?php if ( isset($errors['ldap_bind_pw']) ) { ?><span class="help-inline"><?php print $errors['ldap_bind_pw']; ?></span><?php } ?>
        </div>
-    </div>
-    <div class="control-group">
+    </div> 
+    <div class="control-group<?php if(isset($errors['ldap_auditor_member_dn'])){ print " error"; } ?>">
        <label class="control-label" for="ldap_auditor_member_dn"><?php print $text_ldap_auditor_member_dn; ?>:</label>
        <div class="controls">
           <input type="text" class="text" name="ldap_auditor_member_dn" id="ldap_auditor_member_dn" placeholder="" value="<?php if(isset($a['ldap_auditor_member_dn'])) { print $a['ldap_auditor_member_dn']; } ?>" />
+          <?php if ( isset($errors['ldap_auditor_member_dn']) ) { ?><span class="help-inline"><?php print $errors['ldap_auditor_member_dn']; ?></span><?php } ?>
        </div>
     </div>
 
     <div class="form-actions">
-        <input type="submit" value="<?php if(isset($a['description'])) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
-        <input type="reset" value="<?php print $text_clear; ?>" class="btn" onclick="Piler.clear_ldap_test();" />
+        <input type="submit" value="<?php if(isset($id) && ($id > 0)) { print $text_modify; } else { print $text_add; } ?>" class="btn btn-primary" />
+        <?php if(isset($id) && ($id > 0)) { ?>
+            <a href="index.php?route=ldap/list" class="btn"><?php print $text_cancel; ?></a>
+        <?php } else { ?>
+            <input type="reset" value="<?php print $text_clear; ?>" class="btn" onclick="Piler.clear_ldap_test();" />
+        <?php } ?>
     </div>
 
 </form>
@@ -74,26 +99,26 @@
 
    <table id="ss1" class="table table-striped table-condensed">
       <tr>
-         <th class="domaincell"><?php print $text_description; ?></th>
-         <th class="domaincell"><?php print $text_ldap_type; ?></th>
-         <th class="domaincell"><?php print $text_ldap_host; ?></th>
-         <td class="domaincell"><?php print $text_ldap_base_dn; ?></td>
-         <td class="domaincell"><?php print $text_ldap_bind_dn; ?></td>
-         <td class="domaincell"><?php print $text_ldap_auditor_member_dn; ?></td>
-         <th class="domaincell">&nbsp;</th>
-         <th class="domaincell">&nbsp;</th>
+         <th><?php print $text_description; ?></th>
+         <th><?php print $text_ldap_type; ?></th>
+         <th><?php print $text_ldap_host; ?></th>
+         <th><?php print $text_ldap_base_dn; ?></td>
+         <th><?php print $text_ldap_bind_dn; ?></td>
+         <th><?php print $text_ldap_auditor_member_dn; ?></td>
+         <th>&nbsp;</th>
+         <th>&nbsp;</th>
       </tr>
 
 <?php foreach($entries as $e) { ?>
       <tr>
-         <td class="domaincell"><?php print $e['description']; ?></td>
-         <td class="domaincell"><?php print $e['ldap_type']; ?></td>
-         <td class="domaincell"><?php print $e['ldap_host']; ?></td>
-         <td class="domaincell"><?php print $e['ldap_base_dn']; ?></td>
-         <td class="domaincell"><?php print $e['ldap_bind_dn']; ?></td>
-         <td class="domaincell"><?php print $e['ldap_auditor_member_dn']; ?></td>
-         <td class="domaincell"><a href="index.php?route=ldap/list&amp;id=<?php print $e['id']; ?>"><?php print $text_edit; ?></a></td>
-         <td class="domaincell"><a href="index.php?route=ldap/remove&amp;id=<?php print $e['id']; ?>&amp;description=<?php print urlencode($e['description']); ?>&amp;confirmed=1" onclick="if(confirm('<?php print $text_remove; ?>: ' + '\'<?php print $e['description']; ?>\'')) return true; return false;"><?php print $text_remove; ?></a></td>
+         <td><?php print $e['description']; ?></td>
+         <td><?php print $e['ldap_type']; ?></td>
+         <td><?php print $e['ldap_host']; ?></td>
+         <td><?php print $e['ldap_base_dn']; ?></td>
+         <td><?php print $e['ldap_bind_dn']; ?></td>
+         <td><?php print $e['ldap_auditor_member_dn']; ?></td>
+         <td><a href="index.php?route=ldap/list&amp;id=<?php print $e['id']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit; ?></a></td>
+         <td><a href="index.php?route=ldap/remove&amp;id=<?php print $e['id']; ?>&amp;name=<?php print urlencode($e['description']); ?>&amp;confirmed=1" class="confirm-delete" data-id="<?php print $e['id']; ?>" data-name="<?php print $e['description']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
       </tr>
 <?php } ?>
 
diff --git a/webui/view/theme/default/templates/ldap/remove.tpl b/webui/view/theme/default/templates/ldap/remove.tpl
index a6a0580e..962fe89b 100644
--- a/webui/view/theme/default/templates/ldap/remove.tpl
+++ b/webui/view/theme/default/templates/ldap/remove.tpl
@@ -1,11 +1,13 @@
 
-<p>
+<div>
 
 <?php if($confirmed){ ?>
 
-<?php print $x; ?>. <a href="index.php?route=ldap/list"><?php print $text_back; ?></a>
+<div class="alert alert-success"><?php print $x; ?>.</div>
 
 <?php } ?>
 
-</p>
+<p><a href="index.php?route=ldap/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
+
+</div>
 
diff --git a/webui/view/theme/default/templates/user/edit.tpl b/webui/view/theme/default/templates/user/edit.tpl
index eaedf1e4..cb80b766 100644
--- a/webui/view/theme/default/templates/user/edit.tpl
+++ b/webui/view/theme/default/templates/user/edit.tpl
@@ -21,7 +21,7 @@
 
 <?php } elseif(isset($user)) { ?>
 
-<p><a href="index.php?route=user/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=user/remove&amp;id=<?php print $user['uid']; ?>&amp;user=<?php print $user['username']; ?>" class="confirm-delete" data-id="<?php print $user['uid']; ?>" data-name="<?php print $user['realname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_user; ?>: <?php print $user['username']; ?></a></p>
+<p><a href="index.php?route=user/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=user/remove&amp;id=<?php print $user['uid']; ?>&amp;user=<?php print $user['username']; ?>" class="confirm-delete" data-id="<?php print $user['uid']; ?>" data-name="<?php print $user['realname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_user; ?></a></p>
 
     <form action="index.php?route=user/edit" name="edituser" method="post" autocomplete="off" class="form-horizontal">
      <div class="control-group<?php if(isset($errors['email'])){ print " error"; } ?>">
diff --git a/webui/view/theme/default/templates/user/remove.tpl b/webui/view/theme/default/templates/user/remove.tpl
index a857d207..f4fdc48f 100644
--- a/webui/view/theme/default/templates/user/remove.tpl
+++ b/webui/view/theme/default/templates/user/remove.tpl
@@ -7,7 +7,7 @@
 
 <?php } else { ?>
 
-<p><a href="index.php?route=user/edit&amp;uid=<?php print $uid; ?>"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=user/remove&amp;uid=<?php print $uid; ?>&amp;user=<?php print $user; ?>&amp;confirmed=1"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_user; ?>: <?php print $user; ?></a></p>
+    <p><a href="index.php?route=user/edit&amp;uid=<?php print $uid; ?>"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=user/remove&amp;uid=<?php print $uid; ?>&amp;user=<?php print $user; ?>&amp;confirmed=1"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_user; ?>: <?php print $user; ?></a></p>
 
 <?php } ?>