diff --git a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
index 7af62797122..efe6c7209e3 100644
--- a/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
+++ b/server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
@@ -677,7 +677,6 @@ public class ElasticLoadBalancerManagerImpl implements
             NetworkVO network = getNetworkToDeployLb(ipId);
             IPAddressVO ipAddr = _ipAddressDao.findById(ipId);
             long networkId = network.getId();
-
             
             LoadBalancer result = null;
             try {
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 2c50969d32e..bb50b73ba1b 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -586,7 +586,7 @@ public class LoadBalancingRulesManagerImpl<Type> implements LoadBalancingRulesMa
         
         LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
         if (result == null){
-            result =  createLoadBalancer(lb, openFirewall);
+            result = createLoadBalancer(lb, openFirewall);
         } 
     	if(result == null){
     		throw new CloudRuntimeException("Failed to create load balancer rule: "+lb.getName());
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index 97462421da0..c98c5aec36c 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -342,6 +342,7 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
         sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
         sb.and("level", sb.entity().getLevel(), SearchCriteria.Op.EQ);
         sb.and("path", sb.entity().getPath(), SearchCriteria.Op.LIKE);
+        sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
 
         SearchCriteria<DomainVO> sc = sb.create();
 
@@ -366,6 +367,9 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
         if (path != null) {
             sc.setParameters("path", "%" + path + "%");
         }
+        
+        //return only Active domains to the API
+        sc.setParameters("state", Domain.State.Active);
 
         return _domainDao.search(sc, searchFilter);
     }
@@ -398,12 +402,12 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
             domainId = null;
         }
 
-        List<DomainVO> domainList = searchForDomainChildren(searchFilter, domainId, domainName, keyword, path);
+        List<DomainVO> domainList = searchForDomainChildren(searchFilter, domainId, domainName, keyword, path, true);
 
         return domainList;
     }
     
-    private List<DomainVO> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path) {
+    private List<DomainVO> searchForDomainChildren(Filter searchFilter, Long domainId, String domainName, Object keyword, String path, boolean listActiveOnly) {
         SearchCriteria<DomainVO> sc = _domainDao.createSearchCriteria();
 
         if (keyword != null) {
@@ -426,6 +430,10 @@ public class DomainManagerImpl implements DomainManager, DomainService, Manager{
             sc.addAnd("path", SearchCriteria.Op.LIKE, path + "%");
         }
          
+        if (listActiveOnly) {
+        	sc.addAnd("state", SearchCriteria.Op.EQ, Domain.State.Active);
+        }
+        
         return _domainDao.search(sc, searchFilter);
     }
 }