diff --git a/web.py b/web.py
index 69943c4..86998d4 100755
--- a/web.py
+++ b/web.py
@@ -190,13 +190,17 @@ def do_login():
 def create_password():
 	db, c, dc = db_reconnect()
 	c.execute("SELECT COUNT(*) FROM data WHERE username = %s AND instance = %s", (session['username'], session['instance']))
-	if c.fetchone()[0] == 0:
+	try: #TODO: this is a disgusting hack, REMOVE IT
+		if c.fetchone()[0] == 0:
+			db.close()
+			return render_template("create_password.html", bg = "background-image:url('{}')".format(session['avi']))
+		else:
+			#user already exists in database, so they already have a password
+			db.close()
+			return redirect(url_for('main'))
+	except:
 		db.close()
 		return render_template("create_password.html", bg = "background-image:url('{}')".format(session['avi']))
-	else:
-		#user already exists in database, so they already have a password
-		db.close()
-		return redirect(url_for('main'))
 
 @app.route('/internal/create_account', methods=['POST'])
 def create_account():