diff --git a/CTA/CustomTeamAssigner/MainWindow.xaml.cs b/CTA/CustomTeamAssigner/MainWindow.xaml.cs
index 7685900f2..31d1d6b66 100644
--- a/CTA/CustomTeamAssigner/MainWindow.xaml.cs
+++ b/CTA/CustomTeamAssigner/MainWindow.xaml.cs
@@ -24,6 +24,7 @@ namespace CustomTeamAssigner
 
             if (ofd.ShowDialog() == true)
             {
+                Utils.Teams.Clear();
                 File.ReadAllLines(ofd.FileName).Do(line => new Team(line.Split(';')[0]).Import(line));
 
                 Navigator.NavigationService.Navigate(new PlaySetListerPage());
diff --git a/CTA/CustomTeamAssigner/TeamEditorPage.xaml.cs b/CTA/CustomTeamAssigner/TeamEditorPage.xaml.cs
index 9d335d19e..5c58e80db 100644
--- a/CTA/CustomTeamAssigner/TeamEditorPage.xaml.cs
+++ b/CTA/CustomTeamAssigner/TeamEditorPage.xaml.cs
@@ -17,9 +17,20 @@ namespace CustomTeamAssigner
             EditingTeamMembers = team.TeamMembers;
             InitializeMembersGrid();
             InitializeComboBox();
+            InitializeEditorFields();
+        }
+
+        void InitializeEditorFields()
+        {
             OverrideColorCheckBox.IsChecked = EditingTeam.RoleRevealScreenBackgroundColor != "*";
             OverrideTitleCheckBox.IsChecked = EditingTeam.RoleRevealScreenTitle != "*";
             OverrideSubTitleCheckBox.IsChecked = EditingTeam.RoleRevealScreenSubtitle != "*";
+
+            TeamNameTextBox.Text = EditingTeam.TeamName;
+
+            if (OverrideColorCheckBox.IsChecked == true) TeamColorTextBox.Text = EditingTeam.RoleRevealScreenBackgroundColor;
+            if (OverrideTitleCheckBox.IsChecked == true) TeamTitleTextBox.Text = EditingTeam.RoleRevealScreenTitle;
+            if (OverrideSubTitleCheckBox.IsChecked == true) TeamSubTitleTextBox.Text = EditingTeam.RoleRevealScreenSubtitle;
         }
 
         void InitializeMembersGrid()
diff --git a/CTA/CustomTeamAssigner/Utils.cs b/CTA/CustomTeamAssigner/Utils.cs
index 914c69d06..a8d8c7c59 100644
--- a/CTA/CustomTeamAssigner/Utils.cs
+++ b/CTA/CustomTeamAssigner/Utils.cs
@@ -94,6 +94,7 @@ namespace CustomTeamAssigner
 
         public static CustomRoles GetInternalRoleName(this string roleName)
         {
+            if (roleName == "Guess Manager") return CustomRoles.GuessManagerRole;
             var role = RoleNames.FirstOrDefault(x => x.Value == roleName).Key;
             return role != default ? role : Enum.Parse<CustomRoles>(roleName.Replace(" ", string.Empty));
         }