diff --git a/CHANGELOG b/CHANGELOG
index 934a8e8..9e7a4b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@ Move some more settings to the database
 Add CSS to limit list of chatters hight
 Attempt to create database when there is no connection
 Add fallback option for moderator approval
-
+Fix guestaccess selection in setup
 
 Version 1.15.3 - Mar. 6, 2016
 Allow using html tags in linkfilter without breaking dereferrer or image embed
diff --git a/chat.php b/chat.php
index 7039ad5..ebe6280 100644
--- a/chat.php
+++ b/chat.php
@@ -486,8 +486,9 @@ function send_setup(){
 	echo ">$I[guestwait]</option>";
 	echo '<option value="3"';
 	if($ga===3){
-		echo ' selected'; echo ">$I[adminallow]</option>";
+		echo ' selected';
 	}
+	echo ">$I[adminallow]</option>";
 	echo '<option value="0"';
 	if($ga===0){
 		echo ' selected';