diff --git a/src/egs_game.erl b/src/egs_game.erl
index 84b44f8..21e3978 100644
--- a/src/egs_game.erl
+++ b/src/egs_game.erl
@@ -690,23 +690,25 @@ event(ppcube_request, _State) ->
 event(unicube_request, _State) ->
 	psu_game:send_021e();
 
-%% @doc Uni selection handler.
+%% @doc Uni selection handler. Selecting anything reloads the character which will then be sent to its associated area.
 %% @todo When selecting 'Your room', load a default room.
 %% @todo When selecting 'Reload', reload the character in the current lobby.
 %% @todo Delete NPC characters and stop the party on entering myroom too.
-event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) ->
+event({unicube_select, Selection, EntryID}, #state{gid=GID}) ->
 	case Selection of
 		cancel -> ignore;
 		16#ffffffff ->
 			log("uni selection (my room)"),
 			psu_game:send_0230(),
 			% 0220
-			event({area_change, 1120000, 0, 100, 0}, State);
+			{ok, User} = egs_user_model:read(GID),
+			User2 = User#egs_user_model{area=#psu_area{questid=1120000, zoneid=0, mapid=100}, entryid=0},
+			egs_user_model:write(User2),
+			psu_game:char_load(User2);
 		_UniID ->
 			log("uni selection (reload)"),
 			psu_game:send_0230(),
 			% 0220
-			%% force reloading the character and data files (@todo hack, uses myroom questid to do it)
 			{ok, User} = egs_user_model:read(GID),
 			case User#egs_user_model.partypid of
 				undefined ->
@@ -718,10 +720,9 @@ event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) ->
 					[egs_user_model:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
 					psu_party:stop(PartyPid)
 			end,
-			Area = User#egs_user_model.area,
-			NewRow = User#egs_user_model{partypid=undefined, area=Area#psu_area{questid=1120000, zoneid=undefined}, entryid=EntryID},
-			egs_user_model:write(NewRow),
-			event({area_change, Area#psu_area.questid, Area#psu_area.zoneid, Area#psu_area.mapid, EntryID}, State)
+			User2 = User#egs_user_model{entryid=EntryID},
+			egs_user_model:write(User2),
+			psu_game:char_load(User2)
 	end.
 
 %% Internal.
diff --git a/src/psu/psu_game.erl b/src/psu/psu_game.erl
index 9297ee3..60a8fd6 100644
--- a/src/psu/psu_game.erl
+++ b/src/psu/psu_game.erl
@@ -142,11 +142,6 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
 	end,
 	% load area
 	if	QuestChange =:= true ->
-			% reload the character if entering or leaving the room quest
-			if	OldQuestID =:= 1120000; QuestID =:= 1120000 ->
-					char_load(User);
-				true -> ignore
-			end,
 			% load new quest
 			psu_proto:send_0c00(User),
 			psu_proto:send_020e(User, QuestFile);
diff --git a/src/psu/psu_instance.erl b/src/psu/psu_instance.erl
index f33f798..f216603 100644
--- a/src/psu/psu_instance.erl
+++ b/src/psu/psu_instance.erl
@@ -94,7 +94,6 @@ object_init([{floor_button, TrigEventID}|Tail], ZoneID, BlockID, ObjectID, Targe
 	object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1);
 
 object_init([{goggle_target, TrigEventID}|Tail], ZoneID, BlockID, ObjectID, TargetID, ListIndex, ObjectIndex) ->
-	io:format("~p~n", [ObjectID]),
 	object_insert(#psu_object{id={self(), ZoneID, ObjectID}, instancepid=self(), type=goggle_target, args={BlockID, TrigEventID}}),
 	object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1);