diff --git a/po/bygfoot.pot b/po/bygfoot.pot
index 6a0317ac..95be7f03 100644
--- a/po/bygfoot.pot
+++ b/po/bygfoot.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 14:44+0200\n"
+"POT-Creation-Date: 2005-06-20 14:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2886,180 +2886,180 @@ msgstr ""
 msgid " Fortunately he's got a cousin who can help your team out."
 msgstr ""
 
-#: src/user.c:663
+#: src/user.c:669
 #, c-format
 msgid "You start the game with %s in the %s."
 msgstr ""
 
-#: src/user.c:668
+#: src/user.c:674
 #, c-format
 msgid ""
 "%s fires you because of financial mismanagement.\n"
 "You find a new job with %s in the %s."
 msgstr ""
 
-#: src/user.c:674
+#: src/user.c:680
 #, c-format
 msgid ""
 "%s fires you because of unsuccessfulness.\n"
 "You find a new job with %s in the %s."
 msgstr ""
 
-#: src/user.c:680
+#: src/user.c:686
 #, c-format
 msgid ""
 "%s offer you a job in the %s.\n"
 "You accept the challenge and leave %s."
 msgstr ""
 
-#: src/user.c:686
+#: src/user.c:692
 #, c-format
 msgid "You finish the season in the %s on rank %d."
 msgstr ""
 
-#: src/user.c:691
+#: src/user.c:697
 #, c-format
 msgid "You get promoted to the %s."
 msgstr ""
 
-#: src/user.c:695
+#: src/user.c:701
 #, c-format
 msgid "You get relegated to the %s."
 msgstr ""
 
-#: src/user.c:699
+#: src/user.c:705
 #, c-format
 msgid "You win the %s final against %s."
 msgstr ""
 
-#: src/user.c:704
+#: src/user.c:710
 #, c-format
 msgid "You lose in the %s final against %s."
 msgstr ""
 
-#: src/user.c:710
+#: src/user.c:716
 #, c-format
 msgid "You reach the %s (round %d) of the %s."
 msgstr ""
 
-#: src/user.c:715
+#: src/user.c:721
 #, c-format
 msgid "You are champion of the %s!"
 msgstr ""
 
-#: src/user.c:742
+#: src/user.c:748
 msgid " Systems"
 msgstr ""
 
-#: src/user.c:743
+#: src/user.c:749
 msgid " Communications"
 msgstr ""
 
-#: src/user.c:744
+#: src/user.c:750
 msgid " Holdings"
 msgstr ""
 
-#: src/user.c:745
+#: src/user.c:751
 msgid " Industries"
 msgstr ""
 
-#: src/user.c:746
+#: src/user.c:752
 msgid " Company"
 msgstr ""
 
-#: src/user.c:747
+#: src/user.c:753
 msgid " Telecommunications"
 msgstr ""
 
-#: src/user.c:748
+#: src/user.c:754
 msgid " Labs"
 msgstr ""
 
-#: src/user.c:749
+#: src/user.c:755
 msgid " Technologies"
 msgstr ""
 
-#: src/user.c:750
+#: src/user.c:756
 msgid " Chemicals"
 msgstr ""
 
-#: src/user.c:751
+#: src/user.c:757
 msgid " Energy"
 msgstr ""
 
-#: src/user.c:752
+#: src/user.c:758
 msgid " Bank"
 msgstr ""
 
-#: src/user.c:753
+#: src/user.c:759
 msgid " Products"
 msgstr ""
 
-#: src/user.c:754
+#: src/user.c:760
 msgid " Software"
 msgstr ""
 
-#: src/user.c:755
+#: src/user.c:761
 msgid " Scientific"
 msgstr ""
 
-#: src/user.c:756
+#: src/user.c:762
 msgid " Financial"
 msgstr ""
 
-#: src/user.c:757
+#: src/user.c:763
 msgid " Petroleum"
 msgstr ""
 
-#: src/user.c:758
+#: src/user.c:764
 msgid " Restaurants"
 msgstr ""
 
-#: src/user.c:759
+#: src/user.c:765
 msgid " Data Systems"
 msgstr ""
 
-#: src/user.c:761
+#: src/user.c:767
 msgid " Ltd."
 msgstr ""
 
-#: src/user.c:762
+#: src/user.c:768
 msgid " Assoc."
 msgstr ""
 
-#: src/user.c:763
+#: src/user.c:769
 msgid " Co."
 msgstr ""
 
-#: src/user.c:764
+#: src/user.c:770
 msgid " Ent."
 msgstr ""
 
-#: src/user.c:765
+#: src/user.c:771
 msgid " &amp; Co."
 msgstr ""
 
-#: src/user.c:766
+#: src/user.c:772
 msgid " Corp."
 msgstr ""
 
-#: src/user.c:767
+#: src/user.c:773
 msgid " Group"
 msgstr ""
 
-#: src/user.c:769
+#: src/user.c:775
 msgid " &amp; Sons"
 msgstr ""
 
-#: src/user.c:770
+#: src/user.c:776
 msgid " &amp; Daughters"
 msgstr ""
 
-#: src/user.c:771
+#: src/user.c:777
 msgid " Bros."
 msgstr ""
 
-#: src/user.c:851
+#: src/user.c:857
 msgid ""
 "Your current sponsor is satisfied with your results and would like to renew "
 "the contract."
diff --git a/src/misc2_callback_func.c b/src/misc2_callback_func.c
index 30d69335..112088a5 100644
--- a/src/misc2_callback_func.c
+++ b/src/misc2_callback_func.c
@@ -205,7 +205,6 @@ misc2_callback_add_user(void)
     g_array_append_val(users, new_user);
 
     user_set_up_team(&usr(users->len - 1));
-    usr(users->len - 1).counters[COUNT_USER_NEW_SPONSOR] = 1;
 
     file_load_user_conf_file(&usr(users->len - 1));
 
diff --git a/src/user.c b/src/user.c
index fbeef175..91bbb522 100644
--- a/src/user.c
+++ b/src/user.c
@@ -73,8 +73,6 @@ user_set_up_team_new_game(User *user)
 
 	user_set_up_team(user);
     }
-
-    user->counters[COUNT_USER_NEW_SPONSOR] = 1;
 }
 
 /** Set up finances, remove some players etc. for a new user team.
@@ -98,6 +96,8 @@ user_set_up_team(User *user)
     
     user_set_up_finances(user);
     user_set_up_counters(user);
+
+    user->counters[COUNT_USER_NEW_SPONSOR] = 1;
 }
 
 
@@ -496,11 +496,17 @@ void
 user_change_team(User *user, Team *tm)
 {
     gint i;
+    UserSponsor sponsor;
 
     user->tm = tm;
     user->team_id = tm->id;
 
     user_set_up_team(user);
+
+    user->counters[COUNT_USER_NEW_SPONSOR] = 0;
+    g_string_free(user->sponsor.name, TRUE);
+    user->sponsor = user_get_sponsor(&current_user);    
+
     for(i=user->events->len - 1; i >= 0; i--)
 	user_event_remove(user, i);    
 }