diff --git a/backend/src/app/router.gleam b/backend/src/app/router.gleam
index 3e6440e..22b6ca8 100644
--- a/backend/src/app/router.gleam
+++ b/backend/src/app/router.gleam
@@ -149,7 +149,7 @@ fn handle_client_msg(
 
       let token = bit_array.base64_encode(token, True)
 
-      web.JoinResponse(token, username)
+      web.JoinResponse(username, token)
     }
   }
 }
diff --git a/frontend/src/context.rs b/frontend/src/context.rs
index 721d7ff..59d17c6 100644
--- a/frontend/src/context.rs
+++ b/frontend/src/context.rs
@@ -42,11 +42,6 @@ impl Context {
                     ewebsock::WsMessage::Text(msg) => {
                         let game_resp: GameResponse = serde_json::from_str(&msg).unwrap();
 
-                        if let GameResponse::JoinResponse { username, token } = &game_resp {
-                            self.username = username.clone();
-                            self.token = token.clone();
-                        }
-
                         Some(game_resp)
                     }
                     _ => None,
diff --git a/frontend/src/login_screen.rs b/frontend/src/login_screen.rs
index 750df67..09669db 100644
--- a/frontend/src/login_screen.rs
+++ b/frontend/src/login_screen.rs
@@ -16,7 +16,7 @@ pub struct LoginScreen {
 }
 
 impl Screen for LoginScreen {
-    fn handle_frame(&mut self, ctx: &mut Context) -> Option<StateTransition> {
+    fn handle_frame(&mut self, ctx: &mut Context) {
         clear_background(WHITE);
 
         let group_size = Vec2::new(screen_width() * 0.25, screen_height() * 0.05);
@@ -64,12 +64,16 @@ impl Screen for LoginScreen {
 
             self.sent_join = true;
         }
+    }
 
+    fn handle_messages(&mut self, ctx: &mut Context) -> Option<StateTransition> {
         if self.sent_join {
             let msg = ctx.recv_msg();
 
             if let Some(GameResponse::JoinResponse { username, token }) = msg {
-                return Some(StateTransition::JoinAsPlayer { username, token });
+                ctx.username = username;
+                ctx.token = token;
+                return Some(StateTransition::JoinAsPlayer);
             }
 
             self.retry_count += 1;
@@ -84,8 +88,4 @@ impl Screen for LoginScreen {
 
         None
     }
-
-    fn handle_messages(&mut self, ctx: &mut Context) {
-        // do nothing
-    }
 }
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
index d9f8403..7b26156 100644
--- a/frontend/src/main.rs
+++ b/frontend/src/main.rs
@@ -22,23 +22,21 @@ impl State {
             StateTransition::Init | StateTransition::LeaveGame => {
                 Self::Login(LoginScreen::default())
             }
-            StateTransition::JoinAsPlayer { username, token } => {
-                Self::PlayerScreen(PlayerScreen::new(&username, &token))
-            }
+            StateTransition::JoinAsPlayer => Self::PlayerScreen(PlayerScreen::default()),
         }
     }
 
-    pub fn handle_frame(&mut self, ctx: &mut Context) -> Option<StateTransition> {
+    pub fn handle_frame(&mut self, ctx: &mut Context) {
         match self {
-            Self::Init => Some(StateTransition::Init),
+            Self::Init => {}
             Self::Login(login_screen) => login_screen.handle_frame(ctx),
             Self::PlayerScreen(player_screen) => player_screen.handle_frame(ctx),
         }
     }
 
-    pub fn handle_messages(&mut self, ctx: &mut Context) {
+    pub fn handle_messages(&mut self, ctx: &mut Context) -> Option<StateTransition> {
         match self {
-            Self::Init => {}
+            Self::Init => Some(StateTransition::Init),
             State::Login(login_screen) => login_screen.handle_messages(ctx),
             State::PlayerScreen(player_screen) => player_screen.handle_messages(ctx),
         }
@@ -47,7 +45,7 @@ impl State {
 
 pub enum StateTransition {
     Init,
-    JoinAsPlayer { username: String, token: String },
+    JoinAsPlayer,
     LeaveGame,
 }
 
@@ -59,11 +57,12 @@ async fn main() {
     state.transition_state(StateTransition::Init);
 
     loop {
-        state.handle_messages(&mut context);
-
-        if let Some(transition) = state.handle_frame(&mut context) {
+        if let Some(transition) = state.handle_messages(&mut context) {
             state = state.transition_state(transition);
         }
+
+        state.handle_frame(&mut context);
+
         next_frame().await
     }
 }
diff --git a/frontend/src/player_screen.rs b/frontend/src/player_screen.rs
index 7c55107..1193fea 100644
--- a/frontend/src/player_screen.rs
+++ b/frontend/src/player_screen.rs
@@ -7,26 +7,14 @@ use crate::model::buzz_in::BuzzIn;
 use crate::screen::Screen;
 use macroquad::prelude::*;
 
+#[derive(Default)]
 pub struct PlayerScreen {
-    token: String,
-    username: String,
     score: i32,
     button_pressed: bool,
 }
 
-impl PlayerScreen {
-    pub fn new(token: &str, username: &str) -> Self {
-        Self {
-            token: token.to_string(),
-            username: username.to_string(),
-            score: 0,
-            button_pressed: false,
-        }
-    }
-}
-
 impl Screen for PlayerScreen {
-    fn handle_messages(&mut self, ctx: &mut Context) {
+    fn handle_messages(&mut self, ctx: &mut Context) -> Option<StateTransition> {
         let msg = ctx.recv_msg();
 
         if let Some(msg) = msg {
@@ -46,9 +34,11 @@ impl Screen for PlayerScreen {
                 }
             }
         }
+
+        None
     }
 
-    fn handle_frame(&mut self, ctx: &mut Context) -> Option<StateTransition> {
+    fn handle_frame(&mut self, ctx: &mut Context) {
         clear_background(BEIGE);
 
         let button_color = if self.button_pressed {
@@ -95,7 +85,5 @@ impl Screen for PlayerScreen {
                 ctx.send_msg(&ClientMessage::BuzzIn(buzz_in));
             }
         }
-
-        None
     }
 }
diff --git a/frontend/src/screen.rs b/frontend/src/screen.rs
index 5927439..c9e1467 100644
--- a/frontend/src/screen.rs
+++ b/frontend/src/screen.rs
@@ -1,7 +1,6 @@
 use crate::{StateTransition, context::Context};
 
 pub trait Screen {
-    fn init_frame(&mut self) {}
-    fn handle_frame(&mut self, ctx: &mut Context) -> Option<StateTransition>;
-    fn handle_messages(&mut self, ctx: &mut Context);
+    fn handle_frame(&mut self, ctx: &mut Context);
+    fn handle_messages(&mut self, ctx: &mut Context) -> Option<StateTransition>;
 }