diff --git a/htdocs/portal/assets/js/fsportal.js b/htdocs/portal/assets/js/fsportal.js
index a36a86c3ed..cb1e0349b0 100644
--- a/htdocs/portal/assets/js/fsportal.js
+++ b/htdocs/portal/assets/js/fsportal.js
@@ -755,9 +755,9 @@ App.usersController = Ember.ArrayController.create({
 
 
 App.UsersController = Ember.ObjectController.extend({
-  xnewUserButtons: [
-    {title: 'Submit', clicked: "submit"},
-    {title: 'Cancel', clicked: "cancel", dismiss: 'modal'}
+  newUserButtons: [
+    Ember.Object.create({title: 'Create', clicked:"submit", type:"primary"}),
+    Ember.Object.create({title: 'Cancel', clicked: "cancel", dismiss: 'modal'})
   ],
 
   actions: {
@@ -843,9 +843,9 @@ App.sofiaStatusController = Ember.ArrayController.create({
 });
 
 App.SofiaStatusController = Ember.ObjectController.extend({
-	newGatewayButtons: [
-		{title: 'Submit', clicked: "submit"},
-		{title: 'Cancel', clicked: "cancel", dismiss: 'modal'}
+	addGatewayButtons: [
+		Ember.Object.create({title: 'Add', clicked:"submit", type:"primary"}),
+		Ember.Object.create({title: 'Cancel', clicked: "cancel", dismiss: 'modal'})
 	],
 
 	actions: {
diff --git a/htdocs/portal/index.html b/htdocs/portal/index.html
index 1477126b13..c3102b5764 100644
--- a/htdocs/portal/index.html
+++ b/htdocs/portal/index.html
@@ -605,10 +605,6 @@
 			<p>
 				User ID: <input name="user_id" id="user_id"></input><br>
 			</p>
-			<div class="modal-footer">
-				{{#bs-button type="primary" clicked="submit"}}Create{{/bs-button}}
-				{{#bs-button clicked="cancel"}}Cancel{{/bs-button}}
-			</div>
 		{{/bs-modal}}
 
 		<h1>Users</h1>
@@ -671,10 +667,6 @@
 					<input type="text" name="gateway_password" value="">
 				</div>
 			</div>
-			<div class="modal-footer">
-				{{#bs-button type="primary" clicked="submit"}}Add{{/bs-button}}
-				{{#bs-button clicked="cancel"}}Cancel{{/bs-button}}
-			</div>
 		{{/bs-modal}}
 
 		<h1>Sofia Status</h1>