diff --git a/tcshrc.prompt.final b/tcshrc.prompt.final
index 8191a6b..e3cd400 100644
--- a/tcshrc.prompt.final
+++ b/tcshrc.prompt.final
@@ -343,14 +343,16 @@ if( ! $?CSHENV_DISABLE_PROMPT_NESTING ) then
     endif
 endif
 
+set host_prompt_tail=": "
 if( ! $?CSHENV_DISABLE_PROMPT_USER ) then
     set user_prompt_view="${user_color_seq}${user_prompt}%{${sgr_reset}%}"
     if( ! $?CSHENV_DISABLE_PROMPT_HOST ) then
         set at_view="${at_color_seq}@"
+	else
+		set at_view="${host_prompt_tail}" # Hack
     endif
 endif
 if( ! $?CSHENV_DISABLE_PROMPT_HOST ) then
-    set host_prompt_tail=": "
     if( $?CSHENV_DISABLE_PROMPT_GIT && $?CSHENV_DISABLE_PROMPT_PATH ) then
         set host_prompt_tail=""
     endif