diff --git a/info.py b/info.py
index 1b813a9..ea23697 100644
--- a/info.py
+++ b/info.py
@@ -1 +1 @@
-version = 1,5,10
+version = 1,5,11
diff --git a/server.py b/server.py
index 21bc875..9cf7461 100755
--- a/server.py
+++ b/server.py
@@ -149,8 +149,13 @@ def static_html(name):
 	linkheaders = ["</css/style.css>; rel=preload; as=style"]
 	keys = remove_identical(FormsDict.decode(request.query))
 
+	pyhp_file = os.path.exists("website/" + name + ".pyhp")
+	html_file = os.path.exists("website/" + name + ".html")
+	pyhp_pref = settings.get_settings("USE_PYHP")
+
+
 	# if a pyhp file exists, use this
-	if os.path.exists("website/" + name + ".pyhp") and settings.get_settings("USE_PYHP"):
+	if (pyhp_file and pyhp_pref) or (pyhp_file and not html_file):
 		from doreah.pyhp import file
 		environ = {} #things we expose to the pyhp pages
 
diff --git a/settings/default.ini b/settings/default.ini
index 37c37bd..0087509 100644
--- a/settings/default.ini
+++ b/settings/default.ini
@@ -56,4 +56,4 @@ NAME = "Generic Maloja User"
 [Misc]
 
 EXPERIMENTAL_FEATURES = no
-USE_PYHP = yes
+USE_PYHP = no