diff --git a/src/server/ChangeLog b/src/server/ChangeLog
index 6fccbbd1a15c0dccbfd689440ab1a4030bb334a6..543efed2243e4b67f8f3a96b23ab90a77aee4d80 100644
--- a/src/server/ChangeLog
+++ b/src/server/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 10 21:58:18 1991  Per Cederqvist  (ceder at robert)
+
+	* conference.c (delete_conf): Om det {r en brevl}da som tas bort
+	  s} ska personen som tas bort loggas ut f|rst (inte n|dv{ndigtvis
+	  personen som tar bort en person...)
+
 Thu Sep  5 10:14:40 1991  Per Cederqvist  (ceder at lysator)
 
 	* cache.h, simple-cache.c, dbck-cache.c (cached_set_conf_type): 
diff --git a/src/server/conference.c b/src/server/conference.c
index 2a5a25016a3a6d2c6f02f97de6bfc796bfc5b896..9a42330e6fba9244e5b25cf0cb7b96073a8f508c 100644
--- a/src/server/conference.c
+++ b/src/server/conference.c
@@ -4,7 +4,7 @@
  * All atomic calls that deals with conferences.
  */
 
-static char *rcsid = "$Id: conference.c,v 0.10 1991/09/05 08:32:50 ceder Exp $";
+static char *rcsid = "$Id: conference.c,v 0.11 1991/09/10 20:01:58 ceder Exp $";
 
 
 #include <time.h>
@@ -429,7 +429,7 @@ delete_conf (Conf_no	conf_no )
     CHK_LOGIN(FAILURE);
     GET_C_STAT(conf_c, conf_no, FAILURE);
 
-    acc = access_perm(conf_no, conf_c);
+    acc = access_perm (conf_no, conf_c);
     
     if ( acc != unlimited )
     {
@@ -439,15 +439,17 @@ delete_conf (Conf_no	conf_no )
 
     if ( conf_c->type.letter_box )
     {
-	logout_person(ACTPERS);	/* Log out this person from any connection */
+	/* Make sure the person that is deleted is not logged in. */
+
+	logout_person (conf_no);
 
-	if ( do_delete_pers( conf_no ) != OK )
+	if ( do_delete_pers (conf_no) != OK )
 	{
 	    log("ERROR: delete_conf(): can't delete person.\n");
 	}
     }
 
-    do_delete_conf( conf_no, conf_c );
+    do_delete_conf (conf_no, conf_c);
 
     return OK;
 }