diff --git a/backend/__init__.py b/backend/__init__.py
index c0873f9..51df7c4 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -109,6 +109,7 @@ def join_room(sid, room):
     sio.enter_room(sid, room_name)
     while len([p for p in games[i].players if p.name == sio.get_session(sid).name]):
         sio.get_session(sid).name += f'_{random.randint(0,100)}'
+    sio.emit('me', data=sio.get_session(sid).name, room=sid)
     games[i].add_player(sio.get_session(sid))
     advertise_lobbies()
 
diff --git a/frontend/src/components/FullScreenInput.vue b/frontend/src/components/FullScreenInput.vue
index e76ac42..0d0b2ea 100644
--- a/frontend/src/components/FullScreenInput.vue
+++ b/frontend/src/components/FullScreenInput.vue
@@ -13,10 +13,9 @@
 <script>
 export default {
 	name: 'FullScreenInput',
-	components: {
-	},
 	props: {
 		cancel: Function,
+		defaultValue: String,
 		cancelText: {
 			type: String,
 			default: '',
@@ -47,6 +46,7 @@ export default {
 	},
 	mounted() {
 		this.realCancelText = this.cancelText
+		this.val = this.defaultValue
 		if (this.realCancelText == '') {
 			this.realCancelText = this.$t('cancel')
 		}
diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue
index be1e1e4..34d025b 100644
--- a/frontend/src/components/Lobby.vue
+++ b/frontend/src/components/Lobby.vue
@@ -40,7 +40,7 @@
 		<Chooser v-if="selectedInfo" :text="$t('details')" :cards="selectedInfo" :cancelText="$t('ok')" :cancel="()=>{selectedInfo = null}" :select="()=>{selectedInfo = null}"/>
 		<transition name="bounce">
 			<Chooser v-if="hasToChoose" :text="`${$t('choose_card')}${target_p?$t('choose_card_from') + target_p:''}`" :cards="chooseCards" :select="chooseCard"/>
-			<full-screen-input v-if="hasToSetUsername" :text="$t('choose_username')" :val="username" :cancel="setUsername" :cancelText="$t('ok')"/>
+			<full-screen-input v-if="!started && hasToSetUsername" :defaultValue="storedUsername" :text="$t('choose_username')" :val="username" :cancel="setUsername" :cancelText="$t('ok')"/>
 		</transition>
 	</div>
 </template>
@@ -118,6 +118,11 @@ export default {
 		}
 	},
 	computed: {
+		storedUsername() {
+			if (localStorage.getItem('username'))
+				return localStorage.getItem('username')
+			return ''
+		},
 		isRoomOwner() {
 			return this.players.length > 0 && this.players[0].name == this.username
 		},