diff --git a/src/ChangeLog b/src/ChangeLog
index af9fe67e6bc8387f44b59de40f3c41524a0308ee..169c59b94a86c495ec9f52670834db3b4d4f6a44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 18 04:33:02 1991  Linus Tolke Y  (linus at robert)
+
+	* vars.el (lyskom-who-info-buffer-is-on): Default on.
+
+	* cache.el, startup.el (lyskom-who-info-buffer): Nu skapas
+	  bufferten senare och bara ifall det beh|vs.
+
 Mon Dec 16 01:03:06 1991  Linus Tolke Y  (linus at robin)
 
 	* async.el (lyskom-add-new-text): om vi inte f}r h{mta
diff --git a/src/cache.el b/src/cache.el
index 0ac40f97659522155cf6d8311f8b82d9fdcaf650..f1b7ab231831e8c9dc37997a41443f8e6282b078 100644
--- a/src/cache.el
+++ b/src/cache.el
@@ -198,6 +198,8 @@ otherwise return nil"
   "Sets the cache of who-info items."
   (setq lyskom-who-info-cache (list 'WHO-INFO-LIST))
   (lyskom-save-excursion
+   (setq lyskom-who-info-buffer 
+	 (get-buffer-create (concat (buffer-name) "-who")))
    (set-buffer lyskom-who-info-buffer)
    (erase-buffer))
   (mapcar 'cache-add-who-info
diff --git a/src/startup.el b/src/startup.el
index 661bf8006a95a8abf7fe780d8d5d1d34c8703ef7..69c100285701afc27cd1393a14e7fa1390e79d76 100644
--- a/src/startup.el
+++ b/src/startup.el
@@ -104,8 +104,6 @@ Optional arguments: HOST, USERNAME and PASSWORD."
 	(goto-char (point-max))
 	(insert "-----> " output " <-----\n"))
       (set-buffer (process-buffer proc))))
-    (setq lyskom-who-info-buffer 
-	  (get-buffer-create (concat (buffer-name) "-who")))
     (cond
       ((string= output "LysKOM\n")
        (lyskom-init-parse)
@@ -508,7 +506,6 @@ Entry to this mode runs lyskom-mode-hook."
 	(replies-buffer lyskom-unparsed-buffer)
 	(replies-marker lyskom-unparsed-marker)
 	(server-info lyskom-server-info)
-	(who-buffer lyskom-who-info-buffer)
 	(default-password lyskom-default-password))
     (kill-all-local-variables)
     (make-local-variable 'lyskom-default-password)
@@ -529,6 +526,7 @@ Entry to this mode runs lyskom-mode-hook."
     (make-local-variable 'lyskom-server-info)
     (make-local-variable 'lyskom-who-info-cache)
     (make-local-variable 'lyskom-who-info-buffer)
+    (make-local-variable 'lyskom-who-info-buffer-is-on)
     (make-local-variable 'lyskom-prioritize-buffer)
     (make-local-variable 'lyskom-marked-text-cache)
     (make-local-variable 'lyskom-is-parsing)
@@ -573,7 +571,6 @@ Entry to this mode runs lyskom-mode-hook."
     (setq lyskom-unparsed-buffer replies-buffer)
     (setq lyskom-unparsed-marker replies-marker)
     (setq lyskom-server-info server-info)
-    (setq lyskom-who-info-buffer who-buffer)
     (setq lyskom-do-when-done (cons kom-do-when-done kom-do-when-done))
     (setq lyskom-output-queue (lyskom-queue-create))
     (lyskom-set-mode-line (lyskom-get-string 'not-present-anywhere))))
diff --git a/src/vars.el b/src/vars.el
index 37205eb606bf56fd32dc998a5247fc3843196b5c..553e37d3d58a046a4c7e174378b70f5235e978d7 100644
--- a/src/vars.el
+++ b/src/vars.el
@@ -304,7 +304,7 @@ different packets.")
 (defvar lyskom-who-info-buffer nil
   "Buffer for the who info presentation.")
 
-(defvar lyskom-who-info-buffer-is-on nil
+(defvar lyskom-who-info-buffer-is-on t
   "Says wether we are collecting who-information or not.")