diff --git a/main.js b/main.js
index ce640390..e0d0d6f4 100644
--- a/main.js
+++ b/main.js
@@ -103,7 +103,10 @@ function rememberStuff() {
 			document.forms.post.name.value = localStorage.name;
 		if(localStorage.email)
 			document.forms.post.email.value = localStorage.email;
-			
+		
+		if (window.location.hash.indexOf('q') == 1)
+			citeReply(window.location.hash.substring(2));
+		
 		if(sessionStorage.body) {
 			saved = JSON.parse(sessionStorage.body);
 			if(get_cookie('serv')) {
@@ -180,9 +183,7 @@ function init()
 		document.forms.postcontrols.password.value = localStorage.password;
 	}
 	
-	if (window.location.hash.indexOf('q') == 1)
-		citeReply(window.location.hash.substring(2));
-	else if (window.location.hash.substring(1))
+	if(window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
 		highlightReply(window.location.hash.substring(1));
 	
 	init_expanding();
diff --git a/templates/main.js b/templates/main.js
index 89f98ccd..4476e2ff 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -103,7 +103,10 @@ function rememberStuff() {
 			document.forms.post.name.value = localStorage.name;
 		if(localStorage.email)
 			document.forms.post.email.value = localStorage.email;
-			
+		
+		if (window.location.hash.indexOf('q') == 1)
+			citeReply(window.location.hash.substring(2));
+		
 		if(sessionStorage.body) {
 			saved = JSON.parse(sessionStorage.body);
 			if(get_cookie('{config[cookies][js]}')) {
@@ -180,9 +183,7 @@ function init()
 		document.forms.postcontrols.password.value = localStorage.password;
 	}
 	
-	if (window.location.hash.indexOf('q') == 1)
-		citeReply(window.location.hash.substring(2));
-	else if (window.location.hash.substring(1))
+	if(window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
 		highlightReply(window.location.hash.substring(1));
 	
 	{config[inline_expanding]?init_expanding();}