diff --git a/www/account_manager/show_user.php b/www/account_manager/show_user.php
index e181c20..c062008 100644
--- a/www/account_manager/show_user.php
+++ b/www/account_manager/show_user.php
@@ -366,6 +366,29 @@ if ($ldap_search) {
  }
 
 </script>
+<style type='text/css'>
+  .dual-list .list-group {
+      margin-top: 8px;
+  }
+
+  .list-left li, .list-right li {
+      cursor: pointer;
+  }
+
+  .list-arrows {
+      padding-top: 100px;
+  }
+
+  .list-arrows button {
+          margin-bottom: 20px;
+  }
+
+  .right_button {
+    width: 200px;
+    float: right;
+  }
+</style>
+
 
 <div class="container">
  <div class="col-sm-8 col-md-offset-2">
diff --git a/www/change_password/index.php b/www/change_password/index.php
index 5aa9479..b56568c 100644
--- a/www/change_password/index.php
+++ b/www/change_password/index.php
@@ -56,20 +56,17 @@ if (isset($mismatched)) {  ?>
 <script type="text/javascript" src="<?php print $SERVER_PATH; ?>js/zxcvbn-bootstrap-strength-meter.js"></script>
 <script type="text/javascript">$(document).ready(function(){	$("#StrengthProgressBar").zxcvbnProgressBar({ passwordInput: "#password" });});</script>
 
-<div class="container">
- <div class="col-sm-6">
-   <div class="panel panel-default">
-    <p>Use this form to change your <?php print $ORGANISATION_NAME; ?> password.  When you start typing your new password the gauge at the bottom will show its security strength.
-    Enter your password again in the <b>confirm</b> field.  If the passwords don't match then both fields will be bordered with red.</p>
-   </div>
- </div>
-</div>
-
 <div class="container">
  <div class="col-sm-6">
 
   <div class="panel panel-default">
    <div class="panel-heading text-center">Change your password</div>
+
+   <ul class="list-group">
+    <li class="list-group-item">Use this form to change your <?php print $ORGANISATION_NAME; ?> password.  When you start typing your new password the gauge at the bottom will show its security strength.
+    Enter your password again in the <b>confirm</b> field.  If the passwords don't match then both fields will be bordered with red.</li>
+   </ul>
+
    <div class="panel-body text-center">
    
     <form class="form-horizontal" action='' method='post'>
diff --git a/www/includes/config.inc.php b/www/includes/config.inc.php
index 4dcf4c5..162a7a4 100644
--- a/www/includes/config.inc.php
+++ b/www/includes/config.inc.php
@@ -35,8 +35,8 @@
 
  if (getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE')) { $LDAP['group_membership_attribute'] = getenv('LDAP_GROUP_MEMBERSHIP_ATTRIBUTE'); }
  if (getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) {
-   if (strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == TRUE )   { $LDAP['group_membership_uses_uid']  = TRUE;  }
-   if (strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == FALSE )  { $LDAP['group_membership_uses_uid']  = FALSE; }
+   if (strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == 'TRUE' )   { $LDAP['group_membership_uses_uid']  = TRUE;  }
+   if (strtoupper(getenv('LDAP_GROUP_MEMBERSHIP_USES_UID')) == 'FALSE' )  { $LDAP['group_membership_uses_uid']  = FALSE; }
  }
 
  $LDAP['require_starttls'] = ((strcasecmp(getenv('LDAP_REQUIRE_STARTTLS'),'TRUE') == 0) ? TRUE : FALSE);