diff --git a/Data/Scripts/003_Game processing/001_StartGame.rb b/Data/Scripts/003_Game processing/001_StartGame.rb
index 6deeba002..1ad9a391f 100644
--- a/Data/Scripts/003_Game processing/001_StartGame.rb	
+++ b/Data/Scripts/003_Game processing/001_StartGame.rb	
@@ -49,6 +49,8 @@ module Game
     $MapFactory = PokemonMapFactory.new($data_system.start_map_id)
     $game_player.moveto($data_system.start_x, $data_system.start_y)
     $game_player.refresh
+    $PokemonEncounters = PokemonEncounters.new
+    $PokemonEncounters.setup($game_map.map_id)
     $game_map.autoplay
     $game_map.update
   end
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index ca6428881..d9be8d06c 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -247,18 +247,20 @@ end
 def pbSuggestTrainerName(gender)
   userName = pbGetUserName()
   userName = userName.gsub(/\s+.*$/,"")
-  if userName.length>0 && userName.length<7
+  if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
     userName[0,1] = userName[0,1].upcase
     return userName
   end
   userName = userName.gsub(/\d+$/,"")
-  if userName.length>0 && userName.length<7
+  if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
     userName[0,1] = userName[0,1].upcase
     return userName
   end
-  return System.user_name.capitalize
+  userName = System.user_name.capitalize
+  userName = userName[0, Settings::MAX_PLAYER_NAME_SIZE]
+  return userName
   # Unreachable
-  #return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE)
+#  return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE)
 end
 
 def pbGetUserName