Index: Chat Core/MVIRCChatConnection.m
===================================================================
--- Chat Core/MVIRCChatConnection.m	(revision 4175)
+++ Chat Core/MVIRCChatConnection.m	(working copy)
@@ -1728,21 +1728,12 @@
 - (void) _handle001WithParameters:(NSArray *) parameters fromSender:(id) sender {
 	MVAssertCorrectThreadRequired( _connectionThread );
 
-	MVSafeRetainAssign( &_queueWait, [NSDate dateWithTimeIntervalSinceNow:0.5] );
+	MVSafeRetainAssign( &_queueWait, [NSDate dateWithTimeIntervalSinceNow:1.5] );
 
 	[self _resetSendQueueInterval];
 
 	[self performSelectorOnMainThread:@selector( _didConnect ) withObject:nil waitUntilDone:NO];
 
-	// Identify if we have a user password
-	if( [[self nicknamePassword] length] ) {
-		if( [[self server] hasCaseInsensitiveSubstring:@"quakenet"] ) {
-			[self sendRawMessageImmediatelyWithFormat:@"PRIVMSG Q@CServe.quakenet.org :AUTH %@ %@", [self preferredNickname], [self nicknamePassword]];
-		} else {
-			[self sendRawMessageImmediatelyWithFormat:@"NICKSERV IDENTIFY %@", [self nicknamePassword]];
-		}
-	}
-
 	// set the current nick name if it is not the same as what re requested (some servers/bouncers will give us a new nickname)
 	if( [parameters count] >= 1 ) {
 		NSString *nick = [self _stringFromPossibleData:[parameters objectAtIndex:0]];
@@ -1752,6 +1743,18 @@
 		}
 	}
 
+	NSLog(@"server: %@, preferred nickname: %@, current nickname: %@", [self server], [self preferredNickname], [self nickname]);
+	// Identify if we have a user password
+	if( [[self nicknamePassword] length] ) {
+		if( [[self server] hasCaseInsensitiveSubstring:@"quakenet"] ) {
+			[self sendRawMessageImmediatelyWithFormat:@"PRIVMSG Q@CServe.quakenet.org :AUTH %@ %@", [self preferredNickname], [self nicknamePassword]];
+		} else if( ![[self nickname] isEqualToString:[self preferredNickname]] ) {
+			[self sendRawMessageImmediatelyWithFormat:@"NICKSERV IDENTIFY %@ %@", [self preferredNickname], [self nicknamePassword]];
+		} else {
+			[self sendRawMessageImmediatelyWithFormat:@"NICKSERV IDENTIFY %@", [self nicknamePassword]];
+		}
+	}
+
 	[self performSelector:@selector( _checkWatchedUsers ) withObject:nil afterDelay:2.];
 }