diff --git a/daemon.go b/daemon.go
index be5de5c..c1ce5a9 100644
--- a/daemon.go
+++ b/daemon.go
@@ -346,6 +346,9 @@ func Processor(events chan ClientEvent, finished chan struct{}) {
 				ClientRegister(client, cmd, cols)
 				continue
 			}
+			if client != nil {
+				client.recvTimestamp = now
+			}
 			switch cmd {
 			case "AWAY":
 				if len(cols) == 1 {
@@ -514,8 +517,5 @@ func Processor(events chan ClientEvent, finished chan struct{}) {
 				client.ReplyNicknamed("421", cmd, "Unknown command")
 			}
 		}
-		if client != nil {
-			client.recvTimestamp = now
-		}
 	}
 }