diff --git a/airtime_mvc/application/configs/application.ini b/airtime_mvc/application/configs/application.ini
index a9302c71d..8c54af91e 100644
--- a/airtime_mvc/application/configs/application.ini
+++ b/airtime_mvc/application/configs/application.ini
@@ -6,11 +6,11 @@ bootstrap.class = "Bootstrap"
 appnamespace = "Application"
 resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
 resources.frontController.params.displayExceptions = 0
-resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
+;resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
 resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandler"
 ;load everything in the modules directory including models
-resources.modules[] = ""
 resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
+resources.modules[] = ""
 resources.view[] =
 ; These are no longer needed. They are specified in /etc/airtime/airtime.conf:
 ;resources.db.adapter = "Pdo_Pgsql"
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 0898f708b..285adfd2d 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -133,6 +133,14 @@ class UserController extends Zend_Controller_Action
             if ($form->isValid($formData) &&
                        $form->validateLogin($formData['cu_login'], $formData['cu_user_id'])) {
                 $user = new Application_Model_User($formData['cu_user_id']);
+                //Stupid hack because our schema enforces non-null first_name
+                //even though by default the admin user has no first name... (....)
+                if (Application_Model_User::getCurrentUser()->isSuperAdmin()) {
+                    if (empty($formData['cu_first_name'])) { 
+                        $formData['cu_first_name'] = "admin";
+                        $formData['cu_last_name'] = "admin"; //ditto, avoid non-null DB constraint
+                    }
+                }
                 $user->setFirstName($formData['cu_first_name']);
                 $user->setLastName($formData['cu_last_name']);
                 // We don't allow 6 x's as a password.
diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php
index 7f45c38d2..62b84ce4b 100644
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@@ -131,6 +131,7 @@ class Application_Form_EditUser extends Zend_Form
             //$this->_redirect('billing/client');
                 $element->setAttrib('disabled', 'disabled');
                 $element->setAttrib('readonly', 'readonly');
+                $element->setRequired(false);
             }
         }
         
diff --git a/airtime_mvc/application/views/scripts/form/edit-user.phtml b/airtime_mvc/application/views/scripts/form/edit-user.phtml
index b92a61b45..a4039f0a0 100644
--- a/airtime_mvc/application/views/scripts/form/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml
@@ -3,7 +3,7 @@
 
   <?php if(Application_Model_User::getCurrentUser()->isSuperAdmin()) : ?>
     <div class="user-data" id="user_details_superadmin_message" style="text-align: center;">
-        <?=sprintf(_("Account details can be changed in your <a href=\"%s\">Billing Settings</a>."), "/billing/client");?>
+        <?=sprintf(_("<b>Note:</b> You are a special \"Super Admin\" type of user.<br>Account details for Super Admins can be changed in your <a href=\"%s\">Billing Settings</a> instead."), "/billing/client");?>
         <br><br>
     </div>
   <?php endif; ?>