diff --git a/webgui/include/ajax/functions/WiSPUsers.php b/webgui/include/ajax/functions/WiSPUsers.php
index 8fdc129ef55da5c248be8ef6458ecb5dc817b555..c72c5c1a95562be65bdbb59f6b0c13d755f769ec 100644
--- a/webgui/include/ajax/functions/WiSPUsers.php
+++ b/webgui/include/ajax/functions/WiSPUsers.php
@@ -266,9 +266,9 @@ function createWiSPUser($params) {
 							case "MBytes":
 								$attrValue = $attr['Value'];
 							case "GBytes":
-								$attrValue = $attr['Value'] * 1024;
+								$attrValue = $attr['Value'] * 1000;
 							case "TBytes":
-								$attrValue = $attr['Value'] * 1048576;
+								$attrValue = $attr['Value'] * 1000000;
 						}
 					}
 				}
@@ -390,9 +390,9 @@ function createWiSPUser($params) {
 									case "MBytes":
 										$attrValue = $attr['Value'];
 									case "GBytes":
-										$attrValue = $attr['Value'] * 1024;
+										$attrValue = $attr['Value'] * 1000;
 									case "TBytes":
-										$attrValue = $attr['Value'] * 1048576;
+										$attrValue = $attr['Value'] * 1000000;
 								}
 							}
 						}
diff --git a/webgui/js/app/windows/WiSPUsers.js b/webgui/js/app/windows/WiSPUsers.js
index 9a943f57afe491ba564e88ba203ab6e47ae220ff..9a2aba0ca5f53fb0abfe574bd1d612210f8f3cee 100644
--- a/webgui/js/app/windows/WiSPUsers.js
+++ b/webgui/js/app/windows/WiSPUsers.js
@@ -613,7 +613,7 @@ function showWiSPUserAddEditWindow(id) {
 									fieldLabel: 'Location',
 									name: 'Location',
 									allowBlank: true,
-									width: 160,
+									width: 140,
 
 									store: new Ext.ux.JsonStore({
 										sortInfo: { field: "Name", direction: "ASC" },