X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=be62db44777c56cb0f22d7e84c293e7ccdc50b36;hb=6a59fb210fde5428b23b55027ab223ead5024112;hp=5cf1a85d91e8c4bf93b12311a6116888b1b54499;hpb=9186298c1c3cc720211b88744e81f4c432479711;p=citadel.git

diff --git a/webcit/auth.c b/webcit/auth.c
index 5cf1a85d9..be62db447 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -386,13 +386,6 @@ void finalize_openid_login(void)
 		output_headers(1, 0, 0, 0, 1, 0);
 		do_template("authpopup_finished", NULL);
 		end_burst();
-
-		/* FIXME make this work again.  Maybe put it in authpopup_finished?
-		if (WC->need_regi) {
-			display_reg(1);
-		}
-		*/
-
 	} else {
 		begin_burst();
 		output_headers(1, 0, 0, 0, 1, 0);
@@ -702,7 +695,7 @@ void display_reg(int during_login)
 	if (goto_config_room(Buf, &Room) != 0) {
 		syslog(9, "display_reg() exiting because goto_config_room() failed\n");
 		if (during_login) {
-			do_welcome();
+			pop_destination();
 		}
 		else {
 			display_main_menu();
@@ -718,7 +711,7 @@ void display_reg(int during_login)
 	if (vcard_msgnum < 0L) {
 		syslog(9, "display_reg() exiting because locate_user_vcard_in_this_room() failed\n");
 		if (during_login) {
-			do_welcome();
+			pop_destination();
 		}
 		else {
 			display_main_menu();
@@ -727,7 +720,7 @@ void display_reg(int during_login)
 	}
 
 	if (during_login) {
-		do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
+		do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "pop", USERCONFIGROOM);
 	}
 	else {
 		StrBuf *ReturnTo;