diff --git a/webgui/js/app/windows/AdminGroupAttributes.js b/webgui/js/app/windows/AdminGroupAttributes.js
index 8b059b2408599e9da0bc4665f4b21caabe4e50cc..a13abae3c4a7aa454c64fbb6571a3e680824952b 100644
--- a/webgui/js/app/windows/AdminGroupAttributes.js
+++ b/webgui/js/app/windows/AdminGroupAttributes.js
@@ -49,7 +49,7 @@ function showAdminGroupAttributesWindow(groupID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminGroupAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminGroupAttributesWindow(groupID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -267,7 +267,7 @@ function showAdminGroupAttributeAddEditWindow(groupID,attrID) {
 	adminGroupAttributesFormWindow.show();
 
 	if (attrID) {
-		adminGroupAttributesFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupAttributesFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminGroupMembers.js b/webgui/js/app/windows/AdminGroupMembers.js
index f0b800c2bcda23dbc8cc4596d30c88390f3b28c6..8b7885915bee5778b1a371240a52447fac9db152 100644
--- a/webgui/js/app/windows/AdminGroupMembers.js
+++ b/webgui/js/app/windows/AdminGroupMembers.js
@@ -40,7 +40,7 @@ function showAdminGroupMembersWindow(groupID) {
 					tooltip:'Remove member',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupMembersWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupMembersWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
diff --git a/webgui/js/app/windows/AdminGroups.js b/webgui/js/app/windows/AdminGroups.js
index 4124f82caf3a4a257a7a1c59ad72fee2d40ba63e..bdfaa4f8e14f1de96d92e245404934f5392aa6f7 100644
--- a/webgui/js/app/windows/AdminGroups.js
+++ b/webgui/js/app/windows/AdminGroups.js
@@ -49,7 +49,7 @@ function showAdminGroupWindow() {
 					tooltip:'Edit group',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminGroupWindow() {
 					tooltip:'Remove group',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showAdminGroupWindow() {
 					tooltip:'Group attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showAdminGroupWindow() {
 					tooltip:'Group members',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -277,7 +277,7 @@ function showAdminGroupAddEditWindow(id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminRealmAttributes.js b/webgui/js/app/windows/AdminRealmAttributes.js
index c0caf88107a725245638d3c1481c4fabdd24f483..53bea2d7b4cf72d6b2f8ed6df93ecfaea65a8907 100644
--- a/webgui/js/app/windows/AdminRealmAttributes.js
+++ b/webgui/js/app/windows/AdminRealmAttributes.js
@@ -49,7 +49,7 @@ function showAdminRealmAttributesWindow(realmID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminRealmAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminRealmAttributesWindow(realmID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminRealmAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -267,7 +267,7 @@ function showAdminRealmAttributeAddEditWindow(realmID,attrID) {
 	adminRealmAttributesFormWindow.show();
 
 	if (attrID) {
-		adminRealmAttributesFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminRealmAttributesFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminRealms.js b/webgui/js/app/windows/AdminRealms.js
index b829cd42832ebf66c6fdb8c6e54ffbf03be01afb..80cfc6e6e016d5d2f495bda6987ea53f27ef256d 100644
--- a/webgui/js/app/windows/AdminRealms.js
+++ b/webgui/js/app/windows/AdminRealms.js
@@ -49,7 +49,7 @@ function showAdminRealmWindow() {
 					tooltip:'Edit realm',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showAdminRealmWindow() {
 					tooltip:'Remove realm',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -104,7 +104,7 @@ function showAdminRealmWindow() {
 					tooltip:'Realm attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -236,7 +236,7 @@ function showAdminRealmAddEditWindow(id) {
 	adminRealmFormWindow.show();
 
 	if (id) {
-		adminRealmFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminRealmFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserAttributes.js b/webgui/js/app/windows/AdminUserAttributes.js
index 7574c073e32f3e1a562dc0a71b4404732414ae56..b700aa2d7dde5229276d41e407fd52d8e7926895 100644
--- a/webgui/js/app/windows/AdminUserAttributes.js
+++ b/webgui/js/app/windows/AdminUserAttributes.js
@@ -49,7 +49,7 @@ function showAdminUserAttributesWindow(userID) {
 					tooltip:'Edit attribute',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminUserAttributesWindow(userID) {
 					tooltip:'Remove attribute',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -269,7 +269,7 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 	adminGroupFormWindow.show();
 
 	if (attrID) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserGroups.js b/webgui/js/app/windows/AdminUserGroups.js
index db22ff77e4b8051971806b2170a63b1b1b67757b..38849d302a091cbf43e34a41500f84eeb2268166 100644
--- a/webgui/js/app/windows/AdminUserGroups.js
+++ b/webgui/js/app/windows/AdminUserGroups.js
@@ -49,7 +49,7 @@ function showAdminUserGroupsWindow(userID) {
 					tooltip:'Remove group',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserGroupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -197,7 +197,7 @@ function showAdminUserGroupAddWindow(userID,id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUserLogs.js b/webgui/js/app/windows/AdminUserLogs.js
index 37eda5991e56088423c72504255817b972ce724d..86e7982faaf4f83757310c8b2aa234095290157f 100644
--- a/webgui/js/app/windows/AdminUserLogs.js
+++ b/webgui/js/app/windows/AdminUserLogs.js
@@ -76,7 +76,7 @@ function showAdminUserLogsWindow(id) {
 							handler: function() {
 								// Pull in window, grid & form	
 								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
+								var grid = Ext.getCmp(mainWindow.gridPanelID);
 								var form = mainWindow.getComponent('search-form');
 
 								// Grab store
@@ -247,7 +247,7 @@ function showAdminUserLogsWindow(id) {
 		}
 	);
 	// Grab store
-	var store = adminUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(adminUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
 		var inputTotal = store.sum('AcctInputMbyte');
diff --git a/webgui/js/app/windows/AdminUserTopups.js b/webgui/js/app/windows/AdminUserTopups.js
index b9f14f97b38c214844c337d3c6bd1d5f95f09594..ecee786ed2d5e36f6944b29831468c68ef673c25 100644
--- a/webgui/js/app/windows/AdminUserTopups.js
+++ b/webgui/js/app/windows/AdminUserTopups.js
@@ -48,7 +48,7 @@ function showAdminUserTopupsWindow(userID) {
 					tooltip:'Edit topup',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = adminUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showAdminUserTopupsWindow(userID) {
 					tooltip:'Remove topup',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = adminUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -266,7 +266,7 @@ function showAdminUserTopupAddEditWindow(userID,topupID) {
 	adminUserTopupFormWindow.show();
 
 	if (topupID) {
-		adminUserTopupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminUserTopupFormWindow.formPanelID).load({
 			params: {
 				id: topupID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/AdminUsers.js b/webgui/js/app/windows/AdminUsers.js
index 1951925099cd16ab437ac5dbe92780c64748f429..8924a995d5ad00ed01ee80be7638d3600f1f1367 100644
--- a/webgui/js/app/windows/AdminUsers.js
+++ b/webgui/js/app/windows/AdminUsers.js
@@ -49,7 +49,7 @@ function showAdminUserWindow() {
 					tooltip:'Edit user',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showAdminUserWindow() {
 					tooltip:'Remove user',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showAdminUserWindow() {
 					tooltip:'User attributes',
 					iconCls:'attributes',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showAdminUserWindow() {
 					tooltip:'User logs',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -161,7 +161,7 @@ function showAdminUserWindow() {
 					tooltip:'User groups',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -189,7 +189,7 @@ function showAdminUserWindow() {
 					tooltip:'User topups',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -320,7 +320,7 @@ function showAdminUserAddEditWindow(id) {
 	adminUserFormWindow.show();
 
 	if (id) {
-		adminUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPLocationMembers.js b/webgui/js/app/windows/WiSPLocationMembers.js
index 80643130161ff3abf0c06e7aa56d37c0bcbdddc1..805fe2ef6d2fe07ddc34aa53d7b794f0c7e3b46c 100644
--- a/webgui/js/app/windows/WiSPLocationMembers.js
+++ b/webgui/js/app/windows/WiSPLocationMembers.js
@@ -40,7 +40,7 @@ function showWiSPLocationMembersWindow(locationID) {
 					tooltip:'Remove member',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPLocationMembersWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationMembersWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
diff --git a/webgui/js/app/windows/WiSPLocations.js b/webgui/js/app/windows/WiSPLocations.js
index 110bbb2177b90b8849a24c2f736f9f7acec60697..ad42c7fbdb876e59386388bdea86bf0249d5c1f3 100644
--- a/webgui/js/app/windows/WiSPLocations.js
+++ b/webgui/js/app/windows/WiSPLocations.js
@@ -49,7 +49,7 @@ function showWiSPLocationWindow() {
 					tooltip:'Edit location',
 					iconCls:'edit',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPLocationWindow() {
 					tooltip:'Remove location',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showWiSPLocationWindow() {
 					tooltip:'List members',
 					iconCls:'groups',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -228,7 +228,7 @@ function showWiSPLocationAddEditWindow(id) {
 	wispLocationFormWindow.show();
 
 	if (id) {
-		wispLocationFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispLocationFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPResellers.js b/webgui/js/app/windows/WiSPResellers.js
index bda675c15753d1bd92d691d650f1af7332a9edae..d48e63951ca6c699fd34042a9c51d52c37623ac3 100644
--- a/webgui/js/app/windows/WiSPResellers.js
+++ b/webgui/js/app/windows/WiSPResellers.js
@@ -49,7 +49,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Edit Reseller',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Remove Reseller',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -281,7 +281,7 @@ function showWiSPResellerEditWindow(id) {
 	WiSPResellerFormWindow.show();
 
 	if (id) {
-		WiSPResellerFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(WiSPResellerFormWindow.formPanelID).load({
 			params: {
 				id: id,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPUserLogs.js b/webgui/js/app/windows/WiSPUserLogs.js
index de032d27081c28ba8c1d9ca9ec6c86e243e682a2..0f1ebc8fd8aca348e6ef96de99432e31766d2758 100644
--- a/webgui/js/app/windows/WiSPUserLogs.js
+++ b/webgui/js/app/windows/WiSPUserLogs.js
@@ -76,7 +76,7 @@ function showWiSPUserLogsWindow(id) {
 							handler: function() {
 								// Pull in window, grid & form	
 								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
+								var grid = Ext.getCmp(mainWindow.gridPanelID);
 								var form = mainWindow.getComponent('search-form');
 
 								// Grab store
@@ -247,7 +247,7 @@ function showWiSPUserLogsWindow(id) {
 		}
 	);
 	// Grab store
-	var store = wispUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(wispUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
 		var inputTotal = store.sum('AcctInputMbyte');
diff --git a/webgui/js/app/windows/WiSPUserTopups.js b/webgui/js/app/windows/WiSPUserTopups.js
index 5a880a1c3b1533ce72d26ff6355659125c7d800c..df1e70753b7203d1e75c5df5d1d42e3d5d191c9e 100644
--- a/webgui/js/app/windows/WiSPUserTopups.js
+++ b/webgui/js/app/windows/WiSPUserTopups.js
@@ -48,7 +48,7 @@ function showWiSPUserTopupsWindow(userID) {
 					tooltip:'Edit topup',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -76,7 +76,7 @@ function showWiSPUserTopupsWindow(userID) {
 					tooltip:'Remove topup',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -266,7 +266,7 @@ function showWiSPUserTopupAddEditWindow(userID,topupID) {
 	wispUserTopupFormWindow.show();
 
 	if (topupID) {
-		wispUserTopupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserTopupFormWindow.formPanelID).load({
 			params: {
 				id: topupID,
 				SOAPUsername: globalConfig.soap.username,
diff --git a/webgui/js/app/windows/WiSPUsers.js b/webgui/js/app/windows/WiSPUsers.js
index df31e1612423636c9d7781f04dd0c5973a8aa41b..1c5cd47bab2d0ad794b7e997cb33736c5feafb05 100644
--- a/webgui/js/app/windows/WiSPUsers.js
+++ b/webgui/js/app/windows/WiSPUsers.js
@@ -49,7 +49,7 @@ function showWiSPUserWindow() {
 					tooltip:'Edit user',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -77,7 +77,7 @@ function showWiSPUserWindow() {
 					tooltip:'Remove user',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -105,7 +105,7 @@ function showWiSPUserWindow() {
 					tooltip:'User logs',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -133,7 +133,7 @@ function showWiSPUserWindow() {
 					tooltip:'User topups',
 					iconCls:'logs',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -697,7 +697,7 @@ function showWiSPUserAddEditWindow(id) {
 	wispUserFormWindow.show();
 
 	if (id) {
-		wispUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,