diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index 4a1b80eaa..5f7403dfa 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -2883,7 +2883,7 @@ StrictHostKeyChecking no
 
             website = Websites.objects.get(domain=self.domain)
 
-            folders = ['/home/%s/public_html' % (self.domain), '/home/vmail/%s' % (self.domain)]
+            folders = ['/home/%s/public_html' % (self.domain), '/home/%s' % (self.domain), '/home/vmail/%s' % (self.domain)]
 
             databases = website.databases_set.all()
 
@@ -2898,6 +2898,7 @@ StrictHostKeyChecking no
 
     def folderCheck(self):
         domainPath = '/home/%s/public_html' % (self.domain)
+        vhRoot = '/home/%s' % (self.domain)
         vmailPath = '/home/vmail/%s' % (self.domain)
 
         website = Websites.objects.get(domain=self.domain)
@@ -2906,6 +2907,10 @@ StrictHostKeyChecking no
             self.externalApp = website.externalApp
             return 1
 
+        if self.folder == vhRoot:
+            self.externalApp = website.externalApp
+            return 1
+
         if self.folder == vmailPath:
             self.externalApp = 'vmail'
             return 1
@@ -3004,7 +3009,7 @@ StrictHostKeyChecking no
                 ## Check if home
 
                 home = 0
-                if self.folder == '/home/%s' % (self.domain):
+                if self.folder == '/home/%s/public_html' % (self.domain):
                     home = 1
 
                 ## Fetch Configurations