1 files changed, 6 insertions, 2 deletions
diff --git a/src/irc.c b/src/irc.c
index cafd0a0..00ec89a 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -443,11 +443,13 @@ static void do_numeric(void) {
 		*/
 
 		case ERR_NICKNAMEINUSE:
-			do_catchall(0);
-			if(!regged) {
+			if(regged) {
+				scr_activate(scr_current);
+			} else {
 				permute_nick();
 				send_nick();
 			}
+			do_catchall(1);
 			break;
 
 		/* don't print these, just noise */
@@ -501,6 +503,8 @@ static void do_numeric(void) {
 			break;
 
 		default:
+			if(num >= 400 && num < 600)
+				scr_activate(scr_current);
 			do_catchall(1);
 			break;
 	}