diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0222d51f8bc..b8b00ab4f04 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* server.el (server-generate-key): `called-interactively-p'
+	requires a parameter.
+
 2012-04-14  Michal Nazarewicz  <mina86@mina86.com>
 
 	* server.el (server-auth-key): New variable.
diff --git a/lisp/server.el b/lisp/server.el
index dd40199ad1c..97e9510b8f2 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -558,7 +558,7 @@ into current buffer."
 	 (loop repeat 64
 	       collect (+ 33 (random 94)) into auth
 	       finally return (concat auth))))
-    (if (called-interactively-p)
+    (if (called-interactively-p 'interactive)
 	(insert auth-key))
     auth-key))