diff --git a/lib/users/User.inc b/lib/users/User.inc
index b9d58f0..96364d4 100644
--- a/lib/users/User.inc
+++ b/lib/users/User.inc
@@ -31,6 +31,8 @@
  
 require_once(KT_LIB_DIR . '/database/dbutil.inc'); 
 require_once(KT_LIB_DIR . '/ktentity.inc'); 
+
+define('ADMIN_USER_ID', 1);
  
 class User extends KTEntity {
     /** user's login name */
diff --git a/plugins/ktcore/admin/userManagement.php b/plugins/ktcore/admin/userManagement.php
index 4e9475c..42a8e0a 100755
--- a/plugins/ktcore/admin/userManagement.php
+++ b/plugins/ktcore/admin/userManagement.php
@@ -628,6 +628,52 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
 		return implode(', ', $aGroupNames);
 	}
 
+
+
+        // change enabled / disabled status of users
+        function do_change_enabled() {
+            $this->startTransaction();
+
+            $iLicenses = 0;
+            if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
+                require_once(KT_DIR .  '/plugins/wintools/baobabkeyutil.inc.php');
+                $iLicenses = BaobabKeyUtil::getLicenseCount();
+            }
+
+            // "-2" to account for admin/anonymous
+            $iEnabledUsers = User::getNumberEnabledUsers() - 2;
+
+            foreach(KTUtil::arrayGet($_REQUEST, 'disable_user', array()) as $sUserId => $v) {
+                $oUser = User::get((int)$sUserId);
+                if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }                
+                $oUser->setDisabled(True);
+                $res = $oUser->update();
+                if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
+                $iEnabledUsers--;
+            }
+
+            foreach(KTUtil::arrayGet($_REQUEST, 'enable_user', array()) as $sUserId => $v) {
+                // check that we haven't hit max user limit
+                if($iLicenses !== 0 && $iEnabledUsers >= $iLicenses) { 
+                    // if so, add to error messages, but commit transaction (break this loop)
+                    $_SESSION['KTErrorMessage'][] = _kt('You may only have ') . $iLicenses . _kt(' users enabled at one time.');
+                    break;
+                }
+
+                // else enable user
+                $oUser = User::get((int)$sUserId);
+                if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }               
+                $oUser->setDisabled(False);
+                $res = $oUser->update();
+                if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
+                $iEnabledUsers++;
+            }
+
+            $this->commitTransaction();
+            $this->successRedirectToMain(_kt('Users updated'));
+
+        }
+
 }
 
 ?>
diff --git a/templates/ktcore/principals/useradmin.smarty b/templates/ktcore/principals/useradmin.smarty
index 39232d6..fa7992e 100644
--- a/templates/ktcore/principals/useradmin.smarty
+++ b/templates/ktcore/principals/useradmin.smarty
@@ -54,7 +54,7 @@ very slow if you have many users).{/i18n}</p>
 {/foreach}
 
 <div class="form_actions">
-   <input type="submit" value="{i18n}search for users{/i18n}" />
+   <input type="submit" value="{i18n}Search For Users{/i18n}" />
 </div class="form_actions">
 </fieldset>
 </form>
@@ -62,13 +62,18 @@ very slow if you have many users).{/i18n}</p>
 {if ($no_search === true)}
 {else}
    {if (!empty($search_results))}
+
+<br />
+<form action="{$smarty.server.PHP_SELF}" method="post">
 <table class="kt_collection narrow" cellspacing="0" cellpadding="5">
 <thead>
    <tr>
       <th>{i18n}Name{/i18n}</th>
       <th>{i18n}Username{/i18n}</th>
       <th>{i18n}Edit{/i18n}</th>
-      <th>{i18n}Delete{/i18n}</th>
+      <th>{i18n}Enabled{/i18n}</th>
+      <th>{i18n}Enable{/i18n}</th>
+      <th>{i18n}Disable{/i18n}</th>
       <th>{i18n}Group Memberships{/i18n}</th>
       <th>{i18n}Current Groups{/i18n}</th>
    </tr>
@@ -80,7 +85,25 @@ very slow if you have many users).{/i18n}</p>
         <td>{$oUser->getName()}</td>
         <td>{$oUser->getUsername()}</td>
         <td><a href="{addQS}action=editUser&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}" class="ktAction ktEdit">{i18n}Edit{/i18n}</a></td>
-        <td><a href="{addQS}action=deleteuser&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
+        <td class="centered">
+        {if ($oUser->getDisabled())}
+            <span class="ktAction ktDenied" title="{i18n}Disabled{/i18n}">{i18n}Disabled{/i18n}</a>        
+        {else}
+            <span class="ktAction ktAllowed" title="{i18n}Enabled{/i18n}">{i18n}Enabled{/i18n}</a>
+        {/if}
+        </td>
+
+        <td class="centered">
+        {if ($oUser->getDisabled() && $oUser->getId() != ADMIN_USER_ID)}<input type="checkbox" name="enable_user[{$oUser->getId()}]" value="1" />
+        {else}&mdash;{/if}
+        </td>
+        
+        <td class="centered">
+        {if (!$oUser->getDisabled() && $oUser->getId() != ADMIN_USER_ID)}<input type="checkbox" name="disable_user[{$oUser->getId()}]" value="1" />
+        {else}&mdash;{/if}
+        </td>
+        
+
         <td><a href="{addQS}action=editgroups&user_id={$oUser->getId()}&old_search={$old_search}{/addQS}">{i18n}Manage Groups{/i18n}</a></td>  
         <td class="title"><span class="descriptiveText">{$context->getGroupStringForUser($oUser)}</span></td>
      </tr>   
@@ -88,7 +111,11 @@ very slow if you have many users).{/i18n}</p>
 
 </tbody>
 </table>
-
+<div class="form_actions">
+<input type="hidden" name="action" value="change_enabled" />
+<input type="submit" value="{i18n}Apply Changes{/i18n}" />
+</div>
+</form>
 {else}
 <div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>