diff --git a/Stub/DiabloUI/selhero.cpp b/Stub/DiabloUI/selhero.cpp
index e938131a3..add163e0c 100644
--- a/Stub/DiabloUI/selhero.cpp
+++ b/Stub/DiabloUI/selhero.cpp
@@ -567,18 +567,20 @@ BOOL __stdcall UiSelHeroMultDialog(
 	}
 	BlackPalette();
 
-	hero_infos.clear();
-	fninfo(&ui_add_hero_info);
+	if (*dlgresult != 4) {
+		hero_infos.clear();
+		fninfo(&ui_add_hero_info);
 
-	if (CreateSinglePlayerChar) {
-		strcpy(name, "testname");
-		DUMMY_PRINT("create hero: %s", name);
+		if (CreateSinglePlayerChar) {
+			strcpy(name, "testname");
+			DUMMY_PRINT("create hero: %s", name);
 
-		_uiheroinfo hero_info = { 1 };
-		strcpy(hero_info.name, name);
-		hero_info.heroclass = HeroChosen;
+			_uiheroinfo hero_info = { 1 };
+			strcpy(hero_info.name, name);
+			hero_info.heroclass = HeroChosen;
 
-		fncreate(&hero_info);
+			fncreate(&hero_info);
+		}
 	}
 
 	selhero_Free();
diff --git a/Stub/storm_net.cpp b/Stub/storm_net.cpp
index f949377f7..2595e0666 100644
--- a/Stub/storm_net.cpp
+++ b/Stub/storm_net.cpp
@@ -99,8 +99,7 @@ int __stdcall SNetInitializeProvider(unsigned long provider, struct _SNETPROGRAM
 	char *cname;
 	char *cdesc;
 	BOOL *multi;
-	ui_info->selectnamecallback(client_info, user_info, ui_info, fileinfo, 0, cname, 0, cdesc, 0, multi);
-	return TRUE;
+	return ui_info->selectnamecallback(client_info, user_info, ui_info, fileinfo, provider, cname, 0, cdesc, 0, multi);
 }
 
 /**