diff --git a/run.py b/run.py
index b322ebab056ef5c987cded9f358a5f1f94da10b8..2c83cd48294e12c08a72c08a111b6008736a1df0 100755
--- a/run.py
+++ b/run.py
@@ -2,4 +2,4 @@
 from server import *
 
 if __name__ == '__main__':
-  app.run(threaded=True)
+	app.run(threaded=True)
diff --git a/server.py b/server.py
index 55dcc177de9e84cbf71899b03a3651d000de24d3..165130efd89d16d41664a916aecad8e3171da0bd 100755
--- a/server.py
+++ b/server.py
@@ -30,6 +30,8 @@ if __name__ == '__main__':
 	config['SQLITE_INIT_DATA'] = True
 	config['DEBUG'] = True
 config.from_pyfile('config.py', silent=True)
+if config['DEBUG']:
+	app.jinja_env.auto_reload = True
 
 from db import query, searchquery, ldapauth, ldapget