diff --git a/include/color.h b/include/color.h
index 57ff8b0..721cc6a 100644
--- a/include/color.h
+++ b/include/color.h
@@ -789,7 +789,7 @@
 #define DEFAULT_FORMAT_WHOLEFT_FOOTER_FSET NULL
 
 #define DEFAULT_STATUS_FORMAT " [%T][%*%@%=%N%#%A]%M [%C%+%W] %Q %H%B%F "
-#define DEFAULT_STATUS_FORMAT1 " [%T][%*%@%=%N%#%A]%M [%C%+%W] %Q %H%B%F "
+#define DEFAULT_STATUS_FORMAT1 " [%T][%*%@%G%=%N%#%A]%M [%C%+%W] %Q %H%B%F "
 #define DEFAULT_STATUS_FORMAT2 " %L %! %K %>%D %J[%u:%a:%f:%b:%h]"
 #define DEFAULT_STATUS_FORMAT3 "BitchX by panasync "
 
diff --git a/source/status.c b/source/status.c
index 8e0763d..d306aaa 100644
--- a/source/status.c
+++ b/source/status.c
@@ -1124,21 +1124,25 @@ static char my_buffer[MY_BUFFER/2+1];
 
 static	char	*status_chanop(Window *window)
 {
-	char	*text;
-	if (window->current_channel && get_channel_oper(window->current_channel, window->server) && 
-			(text = get_wset_string_var(window->wset, STATUS_CHANOP_WSET)))
-		return (text);
-	else
-		RETURN_EMPTY;
+    char	*text;
+
+	if (window->current_channel && 
+        get_channel_oper(window->current_channel, window->server) && 
+        (text = get_wset_string_var(window->wset, STATUS_CHANOP_WSET)))
+        return text;
+
+    RETURN_EMPTY;
 }
 static	char	*status_halfop(Window *window)
 {
-	char	*text;
-	if (window->current_channel && get_channel_halfop(window->current_channel, window->server) &&
-			(text = get_wset_string_var(window->wset, STATUS_HALFOP_WSET)))
-		return (text);
-	else
-		RETURN_EMPTY;
+    char	*text;
+
+    if (window->current_channel && 
+        get_channel_halfop(window->current_channel, window->server) &&
+        (text = get_wset_string_var(window->wset, STATUS_HALFOP_WSET)))
+        return text;
+
+    RETURN_EMPTY;
 }
 
 
@@ -1386,7 +1390,6 @@ static	char	*status_voice(Window *window)
 char	*text;
 	if (window->current_channel &&
 	    get_channel_voice(window->current_channel, window->server) &&
-	    !get_channel_oper(window->current_channel, window->server) &&
 	    (text = get_wset_string_var(window->wset, STATUS_VOICE_WSET)))
 		return text;
 	RETURN_EMPTY;