diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 0c1d1a713e2..0664a76ef7b 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -82,12 +82,9 @@
                   domainid: {
                     label: 'Domain',
                     validation: { required: true },
-                    select: function(args) {										  
-											var array1 = [];
-											if(isAdmin())
-											  array1.push("&listAll=true");
+                    select: function(args) {	
                       $.ajax({
-                        url: createURL("listDomains" + array1.join("")),
+                        url: createURL("listDomains&listAll=true"),
                         dataType: "json",
                         async: false,
                         success: function(json) {
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e2146f2ed13..dacbce8e731 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -105,12 +105,9 @@
                   domainId: {
                     label: 'Domain',
                     dependsOn: 'isPublic',
-                    select: function(args) {										
-										  var array1 = [];
-											if(isAdmin())
-											  array1.push("&listAll=true");										
+                    select: function(args) {		
                       $.ajax({
-                        url: createURL("listDomains" + array1.join("")),
+                        url: createURL("listDomains&listAll=true"),
                         dataType: "json",
                         async: false,
                         success: function(json) {
@@ -419,12 +416,9 @@
                   domainId: {
                     label: 'Domain',
                     dependsOn: 'isPublic',
-                    select: function(args) {
-										  var array1 = [];
-											if(isAdmin())
-											  array1.push("&listAll=true");
+                    select: function(args) {										
                       $.ajax({
-                        url: createURL("listDomains"  + array1.join("")),
+                        url: createURL("listDomains&listAll=true"),
                         dataType: "json",
                         async: false,
                         success: function(json) {
@@ -731,12 +725,9 @@
                   domainId: {
                     label: 'Domain',
                     dependsOn: 'isPublic',
-                    select: function(args) {
-										  var array1 = [];
-											if(isAdmin())
-											  array1.push("&listAll=true");
+                    select: function(args) {										 
                       $.ajax({
-                        url: createURL("listDomains"  + array1.join("")),
+                        url: createURL("listDomains&listAll=true"),
                         dataType: "json",
                         async: false,
                         success: function(json) {
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ba73733be3b..18536478d28 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -647,7 +647,7 @@
                               }
                               else { //list all domains
                                 $.ajax({
-                                  url: createURL("listDomains"),
+                                  url: createURL("listDomains&listAll=true"),
                                   dataType: "json",
                                   async: false,
                                   success: function(json) {
@@ -2636,7 +2636,7 @@
                       // Step 2: Setup Zone
                       function(args) {
                         $.ajax({
-                          url: createURL("listDomains"),
+                          url: createURL("listDomains&listAll=true"),
                           dataType: "json",
                           async: false,
                           success: function(json) {