diff --git a/config/bash_completion.d/ee_auto.rc b/config/bash_completion.d/ee_auto.rc
index cdae4e89..77c61884 100644
--- a/config/bash_completion.d/ee_auto.rc
+++ b/config/bash_completion.d/ee_auto.rc
@@ -74,7 +74,7 @@ _ee_complete()
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
             "install" | "purge" | "remove" )
                 COMPREPLY=( $(compgen \
-                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
+                              -W "--pagespeed --web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
                               -- $cur) )
                 ;;
             "upgrade" )
@@ -235,9 +235,9 @@ _ee_complete()
 
         "--pagespeed" | "--hhvm")
             if [ ${COMP_WORDS[2]} == "create" ]; then
-                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
+                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal"
             elif [ ${COMP_WORDS[2]} == "update" ]; then
-                retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
+                retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal"
             else
                 retlist=""
             fi
diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index 42d92a06..1ee8715d 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -362,7 +362,7 @@ class EESiteCreateController(CementBaseController):
                 dict(help="create proxy for site", nargs='+')),
             (['--experimental'],
                 dict(help="Enable Experimenal packages without prompt",
-                     action='store_true'))),
+                     action='store_true')),
             ]
 
     @expose(hide=True)
@@ -1048,7 +1048,7 @@ class EESiteUpdateController(CementBaseController):
                         pagespeed = True
                 else:
                     data['pagespeed'] = True
-                    pagespeed = False
+                    pagespeed = True
 
         if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
             (stype == oldsitetype and cache == oldcachetype)):
diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py
index 81787201..43e1f0dd 100644
--- a/ee/cli/plugins/site_functions.py
+++ b/ee/cli/plugins/site_functions.py
@@ -91,8 +91,6 @@ def setupdomain(self, data):
             raise SiteError("created nginx configuration failed for site."
                             " check with `nginx -t`")
 
-    if 'proxy' in data.keys() and data['proxy']:
-        return
 
     # create symbolic link for
     EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available/{0}'
@@ -100,6 +98,9 @@ def setupdomain(self, data):
                                       '/etc/nginx/sites-enabled/{0}'
                                       .format(ee_domain_name)])
 
+    if 'proxy' in data.keys() and data['proxy']:
+        return
+
     # Creating htdocs & logs directory
     Log.info(self, "Setting up webroot \t\t", end='')
     try: