From 63b20c4ba2adf740a5dc29f78d4d0f74f3610c2f Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 8 Oct 2014 10:36:46 -0400
Subject: [PATCH] Revert "rebase modification"

This reverts commit 45c5bbd36a7a357dcb212c4d20dc09925df9e547.
---
 UI/Common/UIxUserRightsEditor.m   | 3 ++-
 UI/WebServerResources/GNUmakefile | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 8a6ee1166..2208c50c2 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -237,6 +237,7 @@
     {
       response = [self responseWithStatus: 403
                                 andString: @"No such user."];
+      return response;
     }
     else 
     {
@@ -250,7 +251,7 @@
 
       response = [self jsCloseWithRefreshMethod: nil];
     }
-  }
+
   return response;
 }
 
diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile
index 7ec9d633c..112e1fe6a 100644
--- a/UI/WebServerResources/GNUmakefile
+++ b/UI/WebServerResources/GNUmakefile
@@ -6,9 +6,9 @@ WEBSERVER_RESOURCE_DIRS = css fonts img js
 
 build-static-files:
 	@if [ -d bower_components ]; then \
-	  bower update --allow-root; \
+	  bower update; \
 	else \
-	  bower install --allow-root; \
+	  bower install; \
 	fi
 	( cd bower_components/underscore/ && npm run-script build )
 	grunt build