diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index 6223447e..71434b6e 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -186,6 +186,7 @@ return {
     started="Playing",
     joinRoom="$1 has entered the room.",
     leaveRoom="$1 has left the room.",
+    roomRemoved="Room was removed",
     ready="Ready",
     spectating="Spectating",
 
diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua
index 63ab6f74..6b364668 100644
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -185,6 +185,7 @@ return {
     started="En juego",
     joinRoom="$1 entró a la sala.",
     leaveRoom="$1 salió de la sala.",
+    -- roomRemoved="Room was removed",
     ready="LISTO",
     spectating="Espectando",
 
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index eb3ec4c7..9396dc85 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -177,13 +177,12 @@ return {
     -- started="Playing",
     joinRoom="$1 a rejoint le salon.",
     leaveRoom="$1 a quitté le salon.",
+    -- roomRemoved="Room was removed",
     -- ready="READY",
-    -- connStream="CONNECTING",
-    -- waitStream="WAITING",
     -- spectating="Spectating",
 
 
-    
+
     -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete",
     -- customBGhelp="Drop image file here to apply custom background",
     -- customBGloadFailed="Unsupport image format for custom background",
diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua
index 5bde664f..8ac284fc 100644
--- a/parts/language/lang_id.lua
+++ b/parts/language/lang_id.lua
@@ -187,6 +187,7 @@ return {
     started="Bermain",
     joinRoom="$1 telah memasuki ruangan.",
     leaveRoom="$1 telah keluar dari ruangan.",
+    -- roomRemoved="Room was removed",
     ready="Siap",
     spectating="Menonton",
 
diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua
index edcd6a69..f20c209b 100644
--- a/parts/language/lang_ja.lua
+++ b/parts/language/lang_ja.lua
@@ -186,6 +186,7 @@ return {
     started="プレイ中",
     joinRoom="$1 が入室しました",
     leaveRoom="$1 が退出しました",
+    -- roomRemoved="Room was removed",
     ready="準備OK",
     spectating="観戦中",
 
diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua
index 658e095f..c9d406a1 100644
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -174,9 +174,8 @@ return {
     -- started="Playing",
     joinRoom="$1 Entrou a sala.",
     leaveRoom="$1 Saiu da sala.",
+    -- roomRemoved="Room was removed",
     -- ready="READY",
-    -- connStream="CONNECTING",
-    -- waitStream="WAITING",
     -- spectating="Spectating",
 
 
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index f3b14002..e243e8ba 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -186,6 +186,7 @@ return {
     started="游戏中",
     joinRoom="$1 进入房间",
     leaveRoom="$1 离开房间",
+    roomRemoved="房间被解散",
     ready="各就各位！",
     spectating="观战中",
 
diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua
index 478f8e27..5dc5878f 100644
--- a/parts/language/lang_zh_code.lua
+++ b/parts/language/lang_zh_code.lua
@@ -135,6 +135,7 @@ return {
     started="Room.Playing();",
     joinRoom="Room.Join($1);",
     leaveRoom="Room.Leave($1);",
+    roomRemoved="Room.Removed();",
     ready="Ready();",
     spectating="Room.Spectating();",
 
diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua
index 0e6107ae..fdc84199 100644
--- a/parts/language/lang_zh_trad.lua
+++ b/parts/language/lang_zh_trad.lua
@@ -186,6 +186,7 @@ return {
     started="遊戲中",
     joinRoom="$1 進入房間",
     leaveRoom="$1 離開房間",
+    roomRemoved="房間被解散",
     ready="準備！",
     spectating="旁觀中",
 
diff --git a/parts/scenes/login_pw.lua b/parts/scenes/login_pw.lua
index b1253474..64cc1315 100644
--- a/parts/scenes/login_pw.lua
+++ b/parts/scenes/login_pw.lua
@@ -23,8 +23,12 @@ function scene.sceneInit()
 end
 
 function scene.keyDown(key,rep)
-    if key~='return' or rep then return true end
-    _login()
+    if rep then return true end
+    if key=='return' then
+        _login()
+    else
+        return true
+    end
 end
 
 scene.widgetList={
diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua
index 48e3de19..976965d5 100644
--- a/parts/scenes/net_game.lua
+++ b/parts/scenes/net_game.lua
@@ -132,16 +132,29 @@ function scene.keyDown(key,isRep)
         if not inputBox.hide and #mes>0 then
             if mes:sub(1,1)=='/' then
                 local cmd=STRING.split(mes,' ')
+
+                -- Common commands
                 if cmd[1]=='/kick' then
                     if tonumber(cmd[2]) then NET.room_kick(tonumber(cmd[2])) end
+                elseif cmd[1]=='/pw' then
+                    if cmd[2] then NET.room_setPW(cmd[2]) end
                 elseif cmd[1]=='/host' then
                     if tonumber(cmd[2]) then NET.player_setHost(tonumber(cmd[2])) end
                 elseif cmd[1]=='/group' then
                     if tonumber(cmd[2]) and tonumber(cmd[2])%1==0 and tonumber(cmd[2])>=0 and tonumber(cmd[2])<=6 then
                         NET.player_joinGroup(tonumber(cmd[2]))
                     end
-                elseif cmd[1]=='/exit' or cmd[1]=='/quit'then
+                elseif cmd[1]=='/exit' or cmd[1]=='/quit' then
                     _quit()
+
+                -- Admin commands
+                elseif cmd[1]=='/fkick' then
+                    if tonumber(cmd[2]) then NET.room_kick(tonumber(cmd[2]),NET.roomState.roomId) end
+                elseif cmd[1]=='/fpw' then
+                    if cmd[2] then NET.room_setPW(cmd[2],NET.roomState.roomId) end
+                elseif cmd[1]=='/fexit' or cmd[1]=='/fquit' then
+                    NET.room_remove(NET.roomState.roomId)
+
                 else
                     NET.textBox:push{COLOR.R,'Invalid command'}
                 end