diff --git a/web/users_sqlite_bootstrap_templated/templates/LoginPage.tres b/web/users_sqlite_bootstrap_templated/templates/LoginPage.tres
index c601a9e..766b4cf 100644
--- a/web/users_sqlite_bootstrap_templated/templates/LoginPage.tres
+++ b/web/users_sqlite_bootstrap_templated/templates/LoginPage.tres
@@ -11,11 +11,7 @@ func _render(request: WebServerRequest, data: Dictionary) -> String:
 	if (!error_str.empty()):
 		data[\"error_str\"] = get_and_render_template(@\"LoginErrorStrTemplate\", data)
 	
-	var uname_val : String = data[\"uname_val\"]
-	data[\"username_prev_value\"] = \"\"
-	
-	if (!uname_val.empty()):
-		data[\"username_prev_value\"] = 'value=\"' + uname_val + '\"'
+	data[\"username_prev_value\"] = data[\"uname_val\"]
 	
 	return get_and_render_template(@\"Login\", data)
 "
diff --git a/web/users_sqlite_bootstrap_templated/templates/LoginPageTD.phtpl b/web/users_sqlite_bootstrap_templated/templates/LoginPageTD.phtpl
index c6fdab8..78646ad 100644
--- a/web/users_sqlite_bootstrap_templated/templates/LoginPageTD.phtpl
+++ b/web/users_sqlite_bootstrap_templated/templates/LoginPageTD.phtpl
@@ -17,7 +17,7 @@
 		<form method="POST">
 			<div class="form-group">
 				<label for="username_input" class="form_label">Username</label>
-				<input type="text" name="username" {{ username_prev_value }} class="form-control" id="username_input">
+				<input type="text" name="username" {{ qvf(username_prev_value, 'value="%s"', username_prev_value)) }} class="form-control" id="username_input">
 			</div>
 
 			<div class="form-group">