diff --git a/src/finance.c b/src/finance.c
index f8305706..872a6ec7 100644
--- a/src/finance.c
+++ b/src/finance.c
@@ -28,6 +28,7 @@
 #include "game_gui.h"
 #include "league.h"
 #include "maths.h"
+#include "misc.h"
 #include "option.h"
 #include "player.h"
 #include "team.h"
@@ -301,3 +302,57 @@ finance_get_stadium_improvement_duration(gfloat value, gboolean capacity)
 
     return return_value;
 }
+
+/** Update the user's accounts depending on match type and attendance.
+    @fix The fixture being examined. */
+void
+finance_assign_game_money(const Fixture *fix)
+{
+    gint i;
+    gint user_idx[2] = {team_is_user(fix->teams[0]), team_is_user(fix->teams[1])};
+    gfloat journey_factor =
+	(fix->clid < ID_CUP_START ||
+	 (fix->clid >= ID_CUP_START && 
+	  query_cup_is_national(fix->clid))) ?
+	const_float("float_game_finance_journey_factor_national") :
+	const_float("float_game_finance_journey_factor_international");    
+    gint ticket_income[2] = {0, 0};
+
+    if (fix->clid >= ID_CUP_START && 
+	! g_array_index(cup_from_clid(fix->clid)->rounds, CupRound, fix->round).home_away)
+    {
+	ticket_income[0] = 
+	    ticket_income[1] = fix->attendance * const_int("int_team_stadium_ticket_price") / 2;
+    }
+    else
+	ticket_income[0] = fix->attendance * const_int("int_team_stadium_ticket_price");
+
+    for(i = 0; i < 2; i++)
+    {
+	if(user_idx[i] != -1)
+	{
+	    usr(user_idx[i]).money += ticket_income[i];
+	    usr(user_idx[i]).money_in[1][MON_IN_TICKET] += ticket_income[i];
+
+	    usr(user_idx[i]).money -= 
+		(gint)rint((gfloat)ticket_income[i] * (gfloat)usr(user_idx[0]).youth_academy.percentage / 100);
+	    usr(user_idx[i]).money_out[1][MON_OUT_YA] -=
+		(gint)rint((gfloat)ticket_income[i] * (gfloat)usr(user_idx[0]).youth_academy.percentage / 100);
+
+	    if(i == 0 && debug < 50)
+	    {
+		fix->teams[0]->stadium.safety -= 
+		    math_rnd(const_float("float_game_stadium_safety_deterioration_lower"),
+			     const_float("float_game_stadium_safety_deterioration_upper"));
+		fix->teams[0]->stadium.safety = CLAMP(fix->teams[0]->stadium.safety, 0, 1);
+	    }
+
+	    if(i == 1 || !fix->home_advantage)
+	    {
+		usr(user_idx[i]).money_out[1][MON_OUT_JOURNEY] -= 
+		    (gint)(finance_wage_unit(fix->teams[i]) * journey_factor);
+		usr(user_idx[i]).money -= (gint)(finance_wage_unit(fix->teams[i]) * journey_factor);
+	    }
+	}
+    }
+}
diff --git a/src/finance.h b/src/finance.h
index 60a86bcf..1a73ce8c 100644
--- a/src/finance.h
+++ b/src/finance.h
@@ -53,4 +53,7 @@ finance_get_stadium_improvement_cost(gfloat value, gboolean capacity);
 gint
 finance_get_stadium_improvement_duration(gfloat value, gboolean capacity);
 
+void
+finance_assign_game_money(const Fixture *fix);
+
 #endif
diff --git a/src/game.c b/src/game.c
index 45151f14..3c0a3ed9 100644
--- a/src/game.c
+++ b/src/game.c
@@ -272,61 +272,15 @@ void
 game_initialize(Fixture *fix)
 {
     gint i, j;
-    gboolean income_cup = FALSE;
-    gfloat journey_factor =
-	(fix->clid < ID_CUP_START ||
-	 (fix->clid >= ID_CUP_START && 
-	  query_cup_is_national(fix->clid))) ?
-	const_float("float_game_finance_journey_factor_national") :
-	const_float("float_game_finance_journey_factor_international");    
     gint user_idx[2] = {team_is_user(fix->teams[0]), team_is_user(fix->teams[1])};
-    gint ticket_income = 0;
 
     if(fix->home_advantage)
 	game_assign_attendance(fix);
     else
 	game_assign_attendance_neutral(fix);
 
-	if (fix->clid >= ID_CUP_START)
-	{
-		if (! g_array_index(cup_from_clid(fix->clid)->rounds, CupRound, fix->round).home_away)
-		{
-			ticket_income = fix->attendance * const_int("int_team_stadium_ticket_price") / 2;
-			income_cup = TRUE;
-		}
-	}
-	else
-		ticket_income = fix->attendance * const_int("int_team_stadium_ticket_price");
-
-    if(!sett_int("int_opt_disable_finances") && user_idx[0] != -1 && fix->home_advantage)
-    {
-		usr(user_idx[0]).money += ticket_income;
-		usr(user_idx[0]).money_in[1][MON_IN_TICKET] += ticket_income;
-
-		usr(user_idx[0]).money -= 
-	    	(gint)rint((gfloat)ticket_income * (gfloat)usr(user_idx[0]).youth_academy.percentage / 100);
-		usr(user_idx[0]).money_out[1][MON_OUT_YA] -=
-			(gint)rint((gfloat)ticket_income * (gfloat)usr(user_idx[0]).youth_academy.percentage / 100);
-
-		if(debug < 50)
-		{
-    		fix->teams[0]->stadium.safety -= 
-				math_rnd(const_float("float_game_stadium_safety_deterioration_lower"),
-				const_float("float_game_stadium_safety_deterioration_upper"));
-    		fix->teams[0]->stadium.safety = CLAMP(fix->teams[0]->stadium.safety, 0, 1);
-		}
-    }
-    
-    if(!sett_int("int_opt_disable_finances") && user_idx[1] != -1 && income_cup)
-    {
-		usr(user_idx[1]).money += ticket_income;
-		usr(user_idx[1]).money_in[1][MON_IN_TICKET] += ticket_income;
-
-		usr(user_idx[1]).money -= 
-	    	(gint)rint((gfloat)ticket_income * (gfloat)usr(user_idx[1]).youth_academy.percentage / 100);
-		usr(user_idx[1]).money_out[1][MON_OUT_YA] -=
-			(gint)rint((gfloat)ticket_income * (gfloat)usr(user_idx[1]).youth_academy.percentage / 100);
-    }
+    if(!sett_int("int_opt_disable_finances"))
+	finance_assign_game_money(fix);
 
     for(i=0;i<2;i++)
     {
@@ -363,19 +317,6 @@ game_initialize(Fixture *fix)
 
 	if(user_idx[i] != -1)
 	{
-	    if(i == 1 || !fix->home_advantage)
-	    {
-		usr(user_idx[i]).money_out[1][MON_OUT_JOURNEY] -= 
-		    (gint)(finance_wage_unit(fix->teams[i]) * journey_factor);
-		usr(user_idx[i]).money -= (gint)(finance_wage_unit(fix->teams[i]) * journey_factor);
-	    }
-
-	    if(!fix->home_advantage)
-	    {
-		usr(user_idx[i]).money_in[1][MON_IN_TICKET] += (gint)rint((gfloat)ticket_income / 2);
-		usr(user_idx[i]).money += (gint)rint((gfloat)ticket_income / 2);
-	    }
-
 	    usr(user_idx[i]).counters[COUNT_USER_SHOW_RES] = 1;
 	}
     }