diff --git a/src/main.c b/src/main.c
index fdfcd135..d8db549f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -493,7 +493,7 @@ main (gint argc, gchar *argv[])
         if(country.sid == NULL)
         {
             stat0 = STATUS_SPLASH;
-            window_show_splash();
+            window_show_splash(&bygfoot);
 
             if(os_is_unix)
                 file_check_home_dir();
diff --git a/src/misc3_interface.c b/src/misc3_interface.c
index f93febae..166a53df 100644
--- a/src/misc3_interface.c
+++ b/src/misc3_interface.c
@@ -38,11 +38,11 @@ create_window_bets (void)
 }
 
 GtkWidget*
-create_window_splash (void)
+create_window_splash (Bygfoot *bygfoot)
 {
   GtkWidget *window_splash;
   GtkBuilder *builder;
-  builder = load_ui(file_find_support_file("bygfoot_misc3.glade", TRUE));
+  builder = load_ui_with_userdata(file_find_support_file("bygfoot_misc3.glade", TRUE), bygfoot);
   window_splash = GTK_WIDGET (gtk_builder_get_object (builder, "window_splash"));
   gtk_widget_show (window_splash);
 
diff --git a/src/misc3_interface.h b/src/misc3_interface.h
index 3e66fbd2..35dcc633 100644
--- a/src/misc3_interface.h
+++ b/src/misc3_interface.h
@@ -2,7 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
+#include "bygfoot_struct.h"
+
 GtkWidget* create_window_bets (void);
-GtkWidget* create_window_splash (void);
+GtkWidget* create_window_splash (Bygfoot *bygfoot);
 GtkWidget* create_window_alr (void);
 GtkWidget* create_window_news (void);
diff --git a/src/misc_callbacks.c b/src/misc_callbacks.c
index 77eb00c4..9511701a 100644
--- a/src/misc_callbacks.c
+++ b/src/misc_callbacks.c
@@ -575,7 +575,7 @@ on_eventbox_lg_boost_button_press_event (GtkWidget       *widget,
 
 G_MODULE_EXPORT void
 on_button_team_selection_back_clicked  (GtkButton       *button,
-                                        gpointer         user_data)
+                                        Bygfoot         *bygfoot)
 {
 #ifdef DEBUG
     printf("on_button_team_selection_back_clicked\n");
@@ -583,5 +583,5 @@ on_button_team_selection_back_clicked  (GtkButton       *button,
 
     window_destroy(&window.startup);
     stat0 = STATUS_SPLASH;
-    window_show_splash();
+    window_show_splash(bygfoot);
 }
diff --git a/src/misc_callbacks.h b/src/misc_callbacks.h
index c8505182..50371cf7 100644
--- a/src/misc_callbacks.h
+++ b/src/misc_callbacks.h
@@ -175,5 +175,5 @@ on_eventbox_lg_boost_button_press_event
 
 void
 on_button_team_selection_back_clicked  (GtkButton       *button,
-                                        gpointer         user_data);
+                                        Bygfoot         *bygfoot);
 #endif
diff --git a/src/window.c b/src/window.c
index 16cc5da3..7c06aba5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -58,13 +58,13 @@
 
 /** Show the splash screen window. */
 void
-window_show_splash(void)
+window_show_splash(Bygfoot *bygfoot)
 {
 #ifdef DEBUG
     printf("window_show_splash\n");
 #endif
 
-    window_create(WINDOW_SPLASH);
+    window_create_with_userdata(WINDOW_SPLASH, bygfoot);
 
     treeview_show_contributors(
 	GTK_TREE_VIEW(lookup_widget(window.splash, "treeview_splash_contributors")));
@@ -985,7 +985,7 @@ window_create_with_userdata(gint window_type, Bygfoot *bygfoot)
 	    if(window.splash != NULL)
 		debug_print_message("window_create: called on already existing window\n");
 	    else
-		window.splash = create_window_splash();
+		window.splash = create_window_splash(bygfoot);
 	    wind = window.splash;
 	    break;
     case WINDOW_TRAINING_CAMP:
diff --git a/src/window.h b/src/window.h
index 62b1d7eb..82f459ff 100644
--- a/src/window.h
+++ b/src/window.h
@@ -120,7 +120,7 @@ void
 window_show_progress(gint pictype);
 
 void
-window_show_splash(void);
+window_show_splash(Bygfoot *bygfoot);
 
 void
 window_load_hint_number(void);