diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
index bebf89d8b..883a7e831 100644
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@@ -5,7 +5,7 @@ define('VAT_RATE', 19.00);
 class BillingController extends Zend_Controller_Action {
 
     public function init()
-    {
+    {       
         //Two of the actions in this controller return JSON because they're used for AJAX:
         $ajaxContext = $this->_helper->getHelper('AjaxContext');
         $ajaxContext->addActionContext('vat-validator', 'json')
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index f28917e9e..4ce81eb90 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -125,6 +125,10 @@ class UserController extends Zend_Controller_Action
     
     public function editUserAction()
     {
+        if (Application_Model_User::getCurrentUser()->isSuperAdmin()) {
+            $this->_redirect('billing/client');
+        }
+        
         $request = $this->getRequest();
         $form = new Application_Form_EditUser();
         if ($request->isPost()) {