diff --git a/js/flag-preview.js b/js/flag-preview.js
index 6a4d8943..a440f857 100644
--- a/js/flag-preview.js
+++ b/js/flag-preview.js
@@ -4,13 +4,13 @@
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/flag-preview.js';
- *   
+ *
  */
 
 function getFlagUrl(value){
 	// No flag or None flag
 	if(!value || value == "") {
-		return ""
+		return "/static/blank.gif"
 	} else {
 		return "/static/flags/"+value+".png"
 	}
@@ -18,7 +18,7 @@ function getFlagUrl(value){
 
 // Attempt to load flag (see js/save-user_flag.js)
 function loadFlag () {
-	var flagStorage = "flag_" + document.getElementsByName('board')[0].value;
+	var flagStorage = "flag_" + board_name;
 	return window.localStorage.getItem(flagStorage);
 }
 
diff --git a/js/save-user_flag.js b/js/save-user_flag.js
index d588a424..4ca90f9f 100644
--- a/js/save-user_flag.js
+++ b/js/save-user_flag.js
@@ -1,5 +1,5 @@
 function user_flag() {
-	var flagStorage = "flag_" + document.getElementsByName('board')[0].value;
+	var flagStorage = "flag_" + board_name;
 	var item = window.localStorage.getItem(flagStorage);
 	$('select[name=user_flag]').val(item);
 	$('select[name=user_flag]').change(function() {