diff --git a/assets/ETC/ymir work/ui/intro/login/login.dds b/assets/ETC/ymir work/ui/intro/login/login.dds
new file mode 100644
index 00000000..ae10e89d
Binary files /dev/null and b/assets/ETC/ymir work/ui/intro/login/login.dds differ
diff --git a/assets/locale/locale/de/ui/login/loginwindow.sub b/assets/ETC/ymir work/ui/intro/login/loginwindow.sub
similarity index 87%
rename from assets/locale/locale/de/ui/login/loginwindow.sub
rename to assets/ETC/ymir work/ui/intro/login/loginwindow.sub
index fa745f3c..b400b451 100644
--- a/assets/locale/locale/de/ui/login/loginwindow.sub
+++ b/assets/ETC/ymir work/ui/intro/login/loginwindow.sub	
@@ -4,4 +4,4 @@ image "login.dds"
 left 0
 top 0
 right 208
-bottom 97
\ No newline at end of file
+bottom 107
\ No newline at end of file
diff --git a/assets/locale/locale/ae/locale_game.txt b/assets/locale/locale/ae/locale_game.txt
index 5fe7ef10..46805d59 100644
--- a/assets/locale/locale/ae/locale_game.txt
+++ b/assets/locale/locale/ae/locale_game.txt
@@ -304,6 +304,7 @@ JOB_WOLFMAN0	ليكانر هاوي
 JOB_WOLFMAN1	غريزة
 JOB_WOLFMAN2	غير متاح
 LEFT_TIME	الوقت المتبقي
+LOCALE_CHANGE_CONFIRM	غيّر اللغة إلى %s وأعد تحميل اللعبة
 LOGIN_CONNECT_FAILURE	حصل خطأ عند الاتصال بالخادم.
 LOGIN_CONNECT_SUCCESS	تم ربط الاتصال بالخادم.
 LOGIN_CONNETING	انتظر من فضلك. سيتم ربط الاتصال بالخادم.
diff --git a/assets/locale/locale/ae/locale_interface.txt b/assets/locale/locale/ae/locale_interface.txt
index c6f6d9ba..971ec2b4 100644
--- a/assets/locale/locale/ae/locale_interface.txt
+++ b/assets/locale/locale/ae/locale_interface.txt
@@ -198,6 +198,8 @@ LOGIN_CONNECT	ربط الاتصال
 LOGIN_CONNECTING	سيتم ربط الاتصال بالخادم.
 LOGIN_DEFAULT_SERVERADDR	اسم الخادم، قناة 1
 LOGIN_EXIT	إنهاء
+LOGIN_ID	اسم المستخدم
+LOGIN_PASSWORD	كلمة المرور
 LOGIN_SELECT_BUTTON	اختر
 LOGIN_SELECT_EXIT	إنهاء
 LOGIN_SELECT_TITLE	اختر خادم
diff --git a/assets/locale/locale/ae/ui/login/login.dds b/assets/locale/locale/ae/ui/login/login.dds
deleted file mode 100644
index 36f7281c..00000000
Binary files a/assets/locale/locale/ae/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/ae/ui/login/loginwindow.sub b/assets/locale/locale/ae/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/ae/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/ae/ui/loginwindow.py b/assets/locale/locale/ae/ui/loginwindow.py
index ba888c0e..11031d83 100644
--- a/assets/locale/locale/ae/ui/loginwindow.py
+++ b/assets/locale/locale/ae/ui/loginwindow.py
@@ -11,6 +11,9 @@ ROOT_PATH = "d:/ymir work/ui/intro/"
 SERVER_BOARD_HEIGHT = 220 + 180
 SERVER_LIST_HEIGHT = 171 + 180
 
+ID_LIMIT_COUNT = 19
+PW_LIMIT_COUNT = 16
+
 window = {
 	"name" : "LoginWindow",
 	"sytle" : ("movable",),
@@ -558,21 +561,35 @@ window = {
 			"x" : (SCREEN_WIDTH - 208) / 2,
 			"y" : (SCREEN_HEIGHT - 410),
 
-			"image" : LOCALE_PATH + "loginwindow.sub",
+			"image" : "d:/ymir work/ui/intro/login/loginwindow.sub",
 
 			"children" :
 			(
+				{
+					"name" : "ID_Text_window", "type" : "window", "x" : 45, "y" : 4, "width" : 120, "height" : 18,
+					"children" :
+					(
+						{"name":"ID_Text", "type":"text", "x":0, "y":0, "text":uiScriptLocale.LOGIN_ID, "all_align" : "center"},
+					),
+				},
+				{
+					"name" : "Password_Text_window", "type" : "window", "x" : 45, "y" : 41, "width" : 120, "height" : 18,
+					"children" :
+					(
+						{"name":"Password_Text", "type":"text", "x":0, "y":0, "text":uiScriptLocale.LOGIN_PASSWORD, "all_align" : "center"},
+					),
+				},
 				{
 					"name" : "ID_EditLine",
 					"type" : "editline",
 
-					"x" : 83,
-					"y" : 16,
+					"x" : 48,
+					"y" : 23,
 
 					"width" : 120,
 					"height" : 18,
 
-					"input_limit" : 16,
+					"input_limit" : ID_LIMIT_COUNT,
 
 					"r" : 1.0,
 					"g" : 1.0,
@@ -583,13 +600,13 @@ window = {
 					"name" : "Password_EditLine",
 					"type" : "editline",
 
-					"x" : 83,
-					"y" : 43,
+					"x" : 48,
+					"y" : 58,
 
 					"width" : 120,
 					"height" : 18,
 
-					"input_limit" : 16,
+					"input_limit" : PW_LIMIT_COUNT,
 					"secret_flag" : 1,
 
 					"r" : 1.0,
@@ -602,7 +619,7 @@ window = {
 					"type" : "button",
 
 					"x" : 15,
-					"y" : 65,
+					"y" : 79,
 
 					"default_image" : "d:/ymir work/ui/public/large_button_01.sub",
 					"over_image" : "d:/ymir work/ui/public/large_button_02.sub",
@@ -615,7 +632,7 @@ window = {
 					"type" : "button",
 
 					"x" : 105,
-					"y" : 65,
+					"y" : 79,
 
 					"default_image" : "d:/ymir work/ui/public/large_button_01.sub",
 					"over_image" : "d:/ymir work/ui/public/large_button_02.sub",
diff --git a/assets/locale/locale/cz/locale_game.txt b/assets/locale/locale/cz/locale_game.txt
index e8157ab7..2a05c2bd 100644
--- a/assets/locale/locale/cz/locale_game.txt
+++ b/assets/locale/locale/cz/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Amatérský válečník
 JOB_WARRIOR1	Moc Arahanu
 JOB_WARRIOR2	Moc halapartny
 LEFT_TIME	Zbývající čas
+LOCALE_CHANGE_CONFIRM	Změňte jazyk na %s a restartujte hru?
 LOGIN_CONNECT_FAILURE	Chyba při spojení se serverem.
 LOGIN_CONNECT_SUCCESS	Byl jsi připojen na server.
 LOGIN_CONNETING	Budeš připojen na server...
diff --git a/assets/locale/locale/cz/locale_interface.txt b/assets/locale/locale/cz/locale_interface.txt
index 2b4c3ea6..2200d671 100644
--- a/assets/locale/locale/cz/locale_interface.txt
+++ b/assets/locale/locale/cz/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Připojit
 LOGIN_CONNECTING	Budeš spojen se serverem.
 LOGIN_DEFAULT_SERVERADDR	Název serveru, kanál 1
 LOGIN_EXIT	Ukončit
+LOGIN_ID	Uživatelské jméno
+LOGIN_PASSWORD	Heslo
 LOGIN_SELECT_BUTTON	Zvolit
 LOGIN_SELECT_EXIT	Ukončit
 LOGIN_SELECT_TITLE	Zvolit server
diff --git a/assets/locale/locale/cz/ui/login/login.dds b/assets/locale/locale/cz/ui/login/login.dds
deleted file mode 100644
index a6c6d8cd..00000000
Binary files a/assets/locale/locale/cz/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/cz/ui/login/loginwindow.sub b/assets/locale/locale/cz/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/cz/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/de/locale_game.txt b/assets/locale/locale/de/locale_game.txt
index f16a4710..23d9458c 100644
--- a/assets/locale/locale/de/locale_game.txt
+++ b/assets/locale/locale/de/locale_game.txt
@@ -217,6 +217,7 @@ JOB_WARRIOR0	Amateurkrieger
 JOB_WARRIOR1	Macht von Arahan
 JOB_WARRIOR2	Macht der Partisanen
 LEFT_TIME	Verbl. Zeit
+LOCALE_CHANGE_CONFIRM	Sprache auf %s ändern und Spiel neu laden?
 LOGIN_CONNECT_FAILURE	Fehler beim Verbinden mit dem Server.
 LOGIN_CONNECT_SUCCESS	Verbindung zum Server hergestellt.
 LOGIN_CONNETING	Du wirst mit dem Server verbunden...
diff --git a/assets/locale/locale/de/locale_interface.txt b/assets/locale/locale/de/locale_interface.txt
index 646aa891..87fa6c1e 100644
--- a/assets/locale/locale/de/locale_interface.txt
+++ b/assets/locale/locale/de/locale_interface.txt
@@ -173,6 +173,8 @@ LOGIN_CONNECT	Verbinden
 LOGIN_CONNECTING	Du wirst mit dem Server verbunden.
 LOGIN_DEFAULT_SERVERADDR	Servername, Channel 1
 LOGIN_EXIT	Beenden
+LOGIN_ID	Benutzername
+LOGIN_PASSWORD	Passwort
 LOGIN_SELECT_BUTTON	Wählen
 LOGIN_SELECT_EXIT	Beenden
 LOGIN_SELECT_TITLE	Server wählen
diff --git a/assets/locale/locale/de/ui/login/login.dds b/assets/locale/locale/de/ui/login/login.dds
deleted file mode 100644
index 98111c36..00000000
Binary files a/assets/locale/locale/de/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/dk/locale_game.txt b/assets/locale/locale/dk/locale_game.txt
index df7ee5db..1b460d4b 100644
--- a/assets/locale/locale/dk/locale_game.txt
+++ b/assets/locale/locale/dk/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Amatørkriger
 JOB_WARRIOR1	Arahans magt
 JOB_WARRIOR2	Partisanernes magt
 LEFT_TIME	Resterende tid	
+LOCALE_CHANGE_CONFIRM	Ændr sprog til %s og genindlæs spillet?
 LOGIN_CONNECT_FAILURE	En fejl opstod ved forbindelsen til serveren.	
 LOGIN_CONNECT_SUCCESS	Du er forbundet til serveren.
 LOGIN_CONNETING	Forbinder til Serveren...
diff --git a/assets/locale/locale/dk/locale_interface.txt b/assets/locale/locale/dk/locale_interface.txt
index 523072b8..7640430e 100644
--- a/assets/locale/locale/dk/locale_interface.txt
+++ b/assets/locale/locale/dk/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Connect
 LOGIN_CONNECTING	Du bliver forbundet med serveren.
 LOGIN_DEFAULT_SERVERADDR	Servernavn, kanal 1
 LOGIN_EXIT	Afslut
+LOGIN_ID	Brugernavn
+LOGIN_PASSWORD	Adgangskode
 LOGIN_SELECT_BUTTON	Vælg
 LOGIN_SELECT_EXIT	Afslut
 LOGIN_SELECT_TITLE	Vælg server
diff --git a/assets/locale/locale/dk/ui/login/login.dds b/assets/locale/locale/dk/ui/login/login.dds
deleted file mode 100644
index 95e6690f..00000000
Binary files a/assets/locale/locale/dk/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/dk/ui/login/loginwindow.sub b/assets/locale/locale/dk/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/dk/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/en/locale_game.txt b/assets/locale/locale/en/locale_game.txt
index 3ed41189..4861eeee 100644
--- a/assets/locale/locale/en/locale_game.txt
+++ b/assets/locale/locale/en/locale_game.txt
@@ -217,6 +217,7 @@ JOB_WARRIOR0	Amateur Warrior
 JOB_WARRIOR1	Power of Arahan	
 JOB_WARRIOR2	Power of Partisans	
 LEFT_TIME	Time Remaining	
+LOCALE_CHANGE_CONFIRM	Change language to %s and reload the game?
 LOGIN_CONNECT_FAILURE	Error while connecting to the server.	
 LOGIN_CONNECT_SUCCESS	You have been connected to the server.
 LOGIN_CONNETING	You will be connected to the server...
diff --git a/assets/locale/locale/en/locale_interface.txt b/assets/locale/locale/en/locale_interface.txt
index 28b35174..9c649bb5 100644
--- a/assets/locale/locale/en/locale_interface.txt
+++ b/assets/locale/locale/en/locale_interface.txt
@@ -173,6 +173,8 @@ LOGIN_CONNECT	Connect
 LOGIN_CONNECTING	You will be connected to the Server
 LOGIN_DEFAULT_SERVERADDR	Servername, Channel 1
 LOGIN_EXIT	Exit
+LOGIN_ID	Username
+LOGIN_PASSWORD	Password
 LOGIN_SELECT_BUTTON	Choose
 LOGIN_SELECT_EXIT	Exit
 LOGIN_SELECT_TITLE	Choose Server
diff --git a/assets/locale/locale/en/ui/login/login.dds b/assets/locale/locale/en/ui/login/login.dds
deleted file mode 100644
index a3b651a4..00000000
Binary files a/assets/locale/locale/en/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/en/ui/login/loginwindow.sub b/assets/locale/locale/en/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/en/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/es/locale_game.txt b/assets/locale/locale/es/locale_game.txt
index 9076fa95..9f5848bb 100644
--- a/assets/locale/locale/es/locale_game.txt
+++ b/assets/locale/locale/es/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Guerrero Aficionado
 JOB_WARRIOR1	Poder de Arahan
 JOB_WARRIOR2	Poder de Partisanos
 LEFT_TIME	Tiempo restante
+LOCALE_CHANGE_CONFIRM	¿Cambiar el idioma a %s y recargar el juego?
 LOGIN_CONNECT_FAILURE	Error al conectar al servidor.
 LOGIN_CONNECT_SUCCESS	Has sido conectado al servidor.
 LOGIN_CONNETING	Estás siendo conectado al servidor...
diff --git a/assets/locale/locale/es/locale_interface.txt b/assets/locale/locale/es/locale_interface.txt
index 767b88af..1123309f 100644
--- a/assets/locale/locale/es/locale_interface.txt
+++ b/assets/locale/locale/es/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Conectar
 LOGIN_CONNECTING	Serás conectado al servidor
 LOGIN_DEFAULT_SERVERADDR	Nombre del Servidor, Canal 1
 LOGIN_EXIT	Salir
+LOGIN_ID	Nombre de usuario
+LOGIN_PASSWORD	Contraseña
 LOGIN_SELECT_BUTTON	Elegir
 LOGIN_SELECT_EXIT	Salir
 LOGIN_SELECT_TITLE	Elegir Servidor
diff --git a/assets/locale/locale/es/ui/login/login.dds b/assets/locale/locale/es/ui/login/login.dds
deleted file mode 100644
index 513ac0c4..00000000
Binary files a/assets/locale/locale/es/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/es/ui/login/loginwindow.sub b/assets/locale/locale/es/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/es/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/fr/locale_game.txt b/assets/locale/locale/fr/locale_game.txt
index 8b893434..4732469f 100644
--- a/assets/locale/locale/fr/locale_game.txt
+++ b/assets/locale/locale/fr/locale_game.txt
@@ -217,6 +217,7 @@ JOB_WARRIOR0	Guerrier débutant
 JOB_WARRIOR1	Pouvoir d'Arahan
 JOB_WARRIOR2	Pouvoir des Partisans
 LEFT_TIME	Temps restant
+LOCALE_CHANGE_CONFIRM	Changer la langue en %s et recharger le jeu ?
 LOGIN_CONNECT_FAILURE	Erreur lors de la connection au serveur
 LOGIN_CONNECT_SUCCESS	Connexion au serveur en cours.
 LOGIN_CONNETING	Connexion au serveur en cours.
diff --git a/assets/locale/locale/fr/locale_interface.txt b/assets/locale/locale/fr/locale_interface.txt
index fa7f6134..c8753eb7 100644
--- a/assets/locale/locale/fr/locale_interface.txt
+++ b/assets/locale/locale/fr/locale_interface.txt
@@ -173,6 +173,8 @@ LOGIN_CONNECT	Se connecter
 LOGIN_CONNECTING	Vous devez être connecté au serveur
 LOGIN_DEFAULT_SERVERADDR	Nom du serveur, Canal 1
 LOGIN_EXIT	Sortie
+LOGIN_ID	Nom d'utilisateur
+LOGIN_PASSWORD	Mot de passe
 LOGIN_SELECT_BUTTON	Choisissez
 LOGIN_SELECT_EXIT	Sortie
 LOGIN_SELECT_TITLE	Choisissez un serveur
diff --git a/assets/locale/locale/fr/ui/login/login.dds b/assets/locale/locale/fr/ui/login/login.dds
deleted file mode 100644
index 7a5c11f7..00000000
Binary files a/assets/locale/locale/fr/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/fr/ui/login/loginwindow.sub b/assets/locale/locale/fr/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/fr/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/gr/locale_game.txt b/assets/locale/locale/gr/locale_game.txt
index 25ceef75..d1f2c588 100644
--- a/assets/locale/locale/gr/locale_game.txt
+++ b/assets/locale/locale/gr/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Ερασιτέχνης Πολεμιστής
 JOB_WARRIOR1	Ισχύς του Arahan
 JOB_WARRIOR2	Δύναμη των Βετεράνων
 LEFT_TIME	Χρόνος που Απομένει
+LOCALE_CHANGE_CONFIRM	Αλλαγή γλώσσας σε %s και επαναφόρτωση του παιχνιδιού;
 LOGIN_CONNECT_FAILURE	Σφάλμα κατά τη σύνδεση.
 LOGIN_CONNECT_SUCCESS	Συνδέθηκες με τον σέρβερ.
 LOGIN_CONNETING	Σύνδεση με σέρβερ...
diff --git a/assets/locale/locale/gr/locale_interface.txt b/assets/locale/locale/gr/locale_interface.txt
index 6d9ffa0e..e9eec01e 100644
--- a/assets/locale/locale/gr/locale_interface.txt
+++ b/assets/locale/locale/gr/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Σύνδεση
 LOGIN_CONNECTING	Θα συνδεθείτε στο Server
 LOGIN_DEFAULT_SERVERADDR	Servername, Κανάλι 1
 LOGIN_EXIT	Έξοδος
+LOGIN_ID	Όνομα χρήστη
+LOGIN_PASSWORD	Σύνθημα
 LOGIN_SELECT_BUTTON	Επιλογή
 LOGIN_SELECT_EXIT	Έξοδος
 LOGIN_SELECT_TITLE	Επιλογή Server
diff --git a/assets/locale/locale/gr/ui/login/login.dds b/assets/locale/locale/gr/ui/login/login.dds
deleted file mode 100644
index cf016af5..00000000
Binary files a/assets/locale/locale/gr/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/gr/ui/login/loginwindow.sub b/assets/locale/locale/gr/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/gr/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/hu/locale_game.txt b/assets/locale/locale/hu/locale_game.txt
index ed53c006..ccaf20dc 100644
--- a/assets/locale/locale/hu/locale_game.txt
+++ b/assets/locale/locale/hu/locale_game.txt
@@ -217,6 +217,7 @@ JOB_WARRIOR0	Amatőr harcos
 JOB_WARRIOR1	Arahan hatalma
 JOB_WARRIOR2	Partizánok hatalma
 LEFT_TIME	Maradék idő
+LOCALE_CHANGE_CONFIRM	Válts nyelvet erre: %s és töltsd újra a játékot?
 LOGIN_CONNECT_FAILURE	Hiba a szerver kapcsolatban.
 LOGIN_CONNECT_SUCCESS	A szerver kapcsolat létrejött.
 LOGIN_CONNETING	Kapcsolódás a szerverhez...
diff --git a/assets/locale/locale/hu/locale_interface.txt b/assets/locale/locale/hu/locale_interface.txt
index 00ce3fd9..4bc9612e 100644
--- a/assets/locale/locale/hu/locale_interface.txt
+++ b/assets/locale/locale/hu/locale_interface.txt
@@ -173,6 +173,8 @@ LOGIN_CONNECT	Csatlakozik
 LOGIN_CONNECTING	A szerverhez leszel kapcsolva.
 LOGIN_DEFAULT_SERVERADDR	Szervernév, 1. csatorna
 LOGIN_EXIT	Bezár
+LOGIN_ID	Felhasználónév
+LOGIN_PASSWORD	Jelszó
 LOGIN_SELECT_BUTTON	Választ
 LOGIN_SELECT_EXIT	Bezár
 LOGIN_SELECT_TITLE	Szervert választ
diff --git a/assets/locale/locale/hu/ui/login/login.dds b/assets/locale/locale/hu/ui/login/login.dds
deleted file mode 100644
index f9f5eeb2..00000000
Binary files a/assets/locale/locale/hu/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/hu/ui/login/loginwindow.sub b/assets/locale/locale/hu/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/hu/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/it/locale_game.txt b/assets/locale/locale/it/locale_game.txt
index daec3795..605ec5c0 100644
--- a/assets/locale/locale/it/locale_game.txt
+++ b/assets/locale/locale/it/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Guerriero principiante
 JOB_WARRIOR1	Forza di Arahan
 JOB_WARRIOR2	Forza del Partigiano
 LEFT_TIME	Tempo rimanente
+LOCALE_CHANGE_CONFIRM	Cambiare la lingua in %s e ricaricare il gioco?
 LOGIN_CONNECT_FAILURE	Errore di collegamento con il server.
 LOGIN_CONNECT_SUCCESS	Sei stato collegato al server.
 LOGIN_CONNETING	Stai per essere collegato al server.
diff --git a/assets/locale/locale/it/locale_interface.txt b/assets/locale/locale/it/locale_interface.txt
index a2f5a0fa..141e5c86 100644
--- a/assets/locale/locale/it/locale_interface.txt
+++ b/assets/locale/locale/it/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Collegare
 LOGIN_CONNECTING	Stai per essere collegato al server.
 LOGIN_DEFAULT_SERVERADDR	Nome del server, Canale 1
 LOGIN_EXIT	Termina
+LOGIN_ID	Nome utente
+LOGIN_PASSWORD	Password
 LOGIN_SELECT_BUTTON	Scegli
 LOGIN_SELECT_EXIT	Termina
 LOGIN_SELECT_TITLE	Scegli server
diff --git a/assets/locale/locale/it/ui/login/login.dds b/assets/locale/locale/it/ui/login/login.dds
deleted file mode 100644
index d641b360..00000000
Binary files a/assets/locale/locale/it/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/it/ui/login/loginwindow.sub b/assets/locale/locale/it/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/it/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/nl/locale_game.txt b/assets/locale/locale/nl/locale_game.txt
index 498b7aae..c294ee5d 100644
--- a/assets/locale/locale/nl/locale_game.txt
+++ b/assets/locale/locale/nl/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Amateur Krijger
 JOB_WARRIOR1	Kracht van Arahan	
 JOB_WARRIOR2	Kracht van Partizaan	
 LEFT_TIME	Overgebleven Tijd	
+LOCALE_CHANGE_CONFIRM	Taal wijzigen naar %s en het spel opnieuw laden?
 LOGIN_CONNECT_FAILURE	Fout bij de server verbinding.	
 LOGIN_CONNECT_SUCCESS	Je  bent verbonden met de server
 LOGIN_CONNETING	Je wordt verbonden met de server...
diff --git a/assets/locale/locale/nl/locale_interface.txt b/assets/locale/locale/nl/locale_interface.txt
index d1a1f0b6..37769604 100644
--- a/assets/locale/locale/nl/locale_interface.txt
+++ b/assets/locale/locale/nl/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Verbinden
 LOGIN_CONNECTING	Je wordt verbonden met de Server
 LOGIN_DEFAULT_SERVERADDR	Servernaam, Kanaal 1
 LOGIN_EXIT	Exit
+LOGIN_ID	Brukernavn
+LOGIN_PASSWORD	Passwort
 LOGIN_SELECT_BUTTON	Kies
 LOGIN_SELECT_EXIT	Exit
 LOGIN_SELECT_TITLE	Kies Server
diff --git a/assets/locale/locale/nl/ui/login/login.dds b/assets/locale/locale/nl/ui/login/login.dds
deleted file mode 100644
index ff5aa5b9..00000000
Binary files a/assets/locale/locale/nl/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/nl/ui/login/loginwindow.sub b/assets/locale/locale/nl/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/nl/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/pl/locale_game.txt b/assets/locale/locale/pl/locale_game.txt
index d22a45b5..2558000d 100644
--- a/assets/locale/locale/pl/locale_game.txt
+++ b/assets/locale/locale/pl/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Amator Wojownik
 JOB_WARRIOR1	Moc Arahana
 JOB_WARRIOR2	Moc Partyzany
 LEFT_TIME	Pozostały Czas
+LOCALE_CHANGE_CONFIRM	Zmienić język na %s i ponownie załadować grę?
 LOGIN_CONNECT_FAILURE	Błąd podczas łączenia się z serwerem.
 LOGIN_CONNECT_SUCCESS	Zostałeś połączony z serwerem.
 LOGIN_CONNETING	Zostaniesz połączony z serwerem...
diff --git a/assets/locale/locale/pl/locale_interface.txt b/assets/locale/locale/pl/locale_interface.txt
index 5147da62..703f537f 100644
--- a/assets/locale/locale/pl/locale_interface.txt
+++ b/assets/locale/locale/pl/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Połącz
 LOGIN_CONNECTING	Zostaniesz połączony z Serwerem
 LOGIN_DEFAULT_SERVERADDR	Nazwa Serwera, Kanał 1
 LOGIN_EXIT	Wyjdź
+LOGIN_ID	Nazwa użytkownika
+LOGIN_PASSWORD	Hasło
 LOGIN_SELECT_BUTTON	Wybierz
 LOGIN_SELECT_EXIT	Wyjdź
 LOGIN_SELECT_TITLE	Wybierz Serwer
diff --git a/assets/locale/locale/pl/ui/login/login.dds b/assets/locale/locale/pl/ui/login/login.dds
deleted file mode 100644
index 4534cf59..00000000
Binary files a/assets/locale/locale/pl/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/pl/ui/login/loginwindow.sub b/assets/locale/locale/pl/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/pl/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/pt/locale_game.txt b/assets/locale/locale/pt/locale_game.txt
index 68539152..25887e65 100644
--- a/assets/locale/locale/pt/locale_game.txt
+++ b/assets/locale/locale/pt/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Guerreiro Amador
 JOB_WARRIOR1	Poder do Arahan
 JOB_WARRIOR2	Poder do Partidário
 LEFT_TIME	Tempo Restante
+LOCALE_CHANGE_CONFIRM	Alterar o idioma para %s e recarregar o jogo?
 LOGIN_CONNECT_FAILURE	Ocorreu um erro enquanto te ligavas ao Servidor.
 LOGIN_CONNECT_SUCCESS	Estás ligado ao Servidor.
 LOGIN_CONNETING	Vais ser ligado ao Servidor...
diff --git a/assets/locale/locale/pt/locale_interface.txt b/assets/locale/locale/pt/locale_interface.txt
index b06baec6..11f2c903 100644
--- a/assets/locale/locale/pt/locale_interface.txt
+++ b/assets/locale/locale/pt/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Entrar
 LOGIN_CONNECTING	Estás a conectar-te ao Servidor
 LOGIN_DEFAULT_SERVERADDR	Nome do servidor, Canal 1
 LOGIN_EXIT	Sair
+LOGIN_ID	Nome de usuário
+LOGIN_PASSWORD	Senha
 LOGIN_SELECT_BUTTON	Mudar
 LOGIN_SELECT_EXIT	Sair
 LOGIN_SELECT_TITLE	Escolhe o Servidor
diff --git a/assets/locale/locale/pt/ui/login/login.dds b/assets/locale/locale/pt/ui/login/login.dds
deleted file mode 100644
index d59ad85d..00000000
Binary files a/assets/locale/locale/pt/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/pt/ui/login/loginwindow.sub b/assets/locale/locale/pt/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/pt/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/ro/locale_game.txt b/assets/locale/locale/ro/locale_game.txt
index 9f6413be..1e214a9d 100644
--- a/assets/locale/locale/ro/locale_game.txt
+++ b/assets/locale/locale/ro/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Războinic amator
 JOB_WARRIOR1	Puterea Arahan
 JOB_WARRIOR2	Puterea partizanilor
 LEFT_TIME	Timp rămas
+LOCALE_CHANGE_CONFIRM	Schimbați limba în %s și reîncărcați jocul?
 LOGIN_CONNECT_FAILURE	Eroare la conectarea la server.
 LOGIN_CONNECT_SUCCESS	Ai fost conectat la server.
 LOGIN_CONNETING	Vei fi conectat la server...
diff --git a/assets/locale/locale/ro/locale_interface.txt b/assets/locale/locale/ro/locale_interface.txt
index 40d33c47..1929cbdb 100644
--- a/assets/locale/locale/ro/locale_interface.txt
+++ b/assets/locale/locale/ro/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Conectează
 LOGIN_CONNECTING	Conectarea la server rulează.
 LOGIN_DEFAULT_SERVERADDR	Nume server, Canal 1
 LOGIN_EXIT	Închide
+LOGIN_ID	Utilizator
+LOGIN_PASSWORD	Parolă
 LOGIN_SELECT_BUTTON	Alege
 LOGIN_SELECT_EXIT	Închide
 LOGIN_SELECT_TITLE	Alege server
diff --git a/assets/locale/locale/ro/ui/login/login.dds b/assets/locale/locale/ro/ui/login/login.dds
deleted file mode 100644
index ecc70381..00000000
Binary files a/assets/locale/locale/ro/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/ro/ui/login/loginwindow.sub b/assets/locale/locale/ro/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/ro/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/ru/locale_game.txt b/assets/locale/locale/ru/locale_game.txt
index 5eb0f66b..88d71164 100644
--- a/assets/locale/locale/ru/locale_game.txt
+++ b/assets/locale/locale/ru/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Воин-новичок
 JOB_WARRIOR1	Могущество Арахана
 JOB_WARRIOR2	Могущество Партизанов
 LEFT_TIME	Остав.время
+LOCALE_CHANGE_CONFIRM	Изменить язык на %s и перезагрузить игру?
 LOGIN_CONNECT_FAILURE	Ошибка при соединении с сервером.
 LOGIN_CONNECT_SUCCESS	Вы соединены с сервером.
 LOGIN_CONNETING	Происходит соединение с сервером...
diff --git a/assets/locale/locale/ru/locale_interface.txt b/assets/locale/locale/ru/locale_interface.txt
index bed2f4ae..9538f491 100644
--- a/assets/locale/locale/ru/locale_interface.txt
+++ b/assets/locale/locale/ru/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Соединить
 LOGIN_CONNECTING	Происходит соединение с сервером.
 LOGIN_DEFAULT_SERVERADDR	Имя сервера, Канал 1
 LOGIN_EXIT	Выход
+LOGIN_ID	Имя пользователя
+LOGIN_PASSWORD	Пароль
 LOGIN_SELECT_BUTTON	Выбрать
 LOGIN_SELECT_EXIT	Выход
 LOGIN_SELECT_TITLE	Выбрать сервер
diff --git a/assets/locale/locale/ru/ui/login/login.dds b/assets/locale/locale/ru/ui/login/login.dds
deleted file mode 100644
index 958d693e..00000000
Binary files a/assets/locale/locale/ru/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/ru/ui/login/loginwindow.sub b/assets/locale/locale/ru/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/ru/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/locale/locale/tr/locale_game.txt b/assets/locale/locale/tr/locale_game.txt
index 4889f3d2..4f01b610 100644
--- a/assets/locale/locale/tr/locale_game.txt
+++ b/assets/locale/locale/tr/locale_game.txt
@@ -218,6 +218,7 @@ JOB_WARRIOR0	Amatör Savaşçı
 JOB_WARRIOR1	Bedensel Güç
 JOB_WARRIOR2	Zihinsel Güç
 LEFT_TIME	Kalan Süre
+LOCALE_CHANGE_CONFIRM	Dili %s olarak değiştirip oyunu yeniden yükleyeyim mi?
 LOGIN_CONNECT_FAILURE	Sunucuya bağlanırken hata
 LOGIN_CONNECT_SUCCESS	Sunucuya bağlandın.
 LOGIN_CONNETING	Sunucuya bağlanıyorsun...
diff --git a/assets/locale/locale/tr/locale_interface.txt b/assets/locale/locale/tr/locale_interface.txt
index 7958c5fc..1ce321e0 100644
--- a/assets/locale/locale/tr/locale_interface.txt
+++ b/assets/locale/locale/tr/locale_interface.txt
@@ -174,6 +174,8 @@ LOGIN_CONNECT	Bağlan
 LOGIN_CONNECTING	Servera bağlanacaksınız.
 LOGIN_DEFAULT_SERVERADDR	Server ismi, Kanal 1
 LOGIN_EXIT	Çıkış
+LOGIN_ID	Kullanıcı adı
+LOGIN_PASSWORD	Şifre
 LOGIN_SELECT_BUTTON	Seç
 LOGIN_SELECT_EXIT	Çıkış
 LOGIN_SELECT_TITLE	Server Seç
diff --git a/assets/locale/locale/tr/ui/login/login.dds b/assets/locale/locale/tr/ui/login/login.dds
deleted file mode 100644
index f0bd7ea8..00000000
Binary files a/assets/locale/locale/tr/ui/login/login.dds and /dev/null differ
diff --git a/assets/locale/locale/tr/ui/login/loginwindow.sub b/assets/locale/locale/tr/ui/login/loginwindow.sub
deleted file mode 100644
index fa745f3c..00000000
--- a/assets/locale/locale/tr/ui/login/loginwindow.sub
+++ /dev/null
@@ -1,7 +0,0 @@
-title subImage
-version 2.0
-image "login.dds"
-left 0
-top 0
-right 208
-bottom 97
\ No newline at end of file
diff --git a/assets/root/intrologin.py b/assets/root/intrologin.py
index 5f35868d..239d8920 100644
--- a/assets/root/intrologin.py
+++ b/assets/root/intrologin.py
@@ -447,7 +447,9 @@ class LoginWindow(ui.ScriptWindow):
 			self.serverExitButton		= GetObject("ServerExitButton")
 			self.connectBoard			= GetObject("ConnectBoard")
 			self.loginBoard				= GetObject("LoginBoard")
+			self.idText					= GetObject("ID_Text")
 			self.idEditLine				= GetObject("ID_EditLine")
+			self.pwdText				= GetObject("Password_Text")
 			self.pwdEditLine			= GetObject("Password_EditLine")
 			self.serverInfo				= GetObject("ConnectName")
 			self.selectConnectButton	= GetObject("SelectConnectButton")
@@ -641,6 +643,8 @@ class LoginWindow(ui.ScriptWindow):
 				self.loginExitButton: "LOGIN_EXIT",
 				self.serverSelectButton: "OK",
 				self.serverExitButton: "LOGIN_SELECT_EXIT",
+				self.idText: "LOGIN_ID",
+				self.pwdText: "LOGIN_PASSWORD",
 			}
 			uiLocaleRefresh.RefreshByMapping(elementMapping)
 
diff --git a/assets/root/localeinfo.py b/assets/root/localeinfo.py
index c8b6e214..5ee906a7 100644
--- a/assets/root/localeinfo.py
+++ b/assets/root/localeinfo.py
@@ -13,8 +13,6 @@ BLEND_POTION_NO_INFO				= 'BLEND_POTION_NO_INFO'
 LOGIN_FAILURE_WRONG_SOCIALID 		= 'LOGIN_FAILURE_WRONG_SOCIALID'
 LOGIN_FAILURE_SHUTDOWN_TIME 		= 'LOGIN_FAILURE_SHUTDOWN_TIME'
 
-LOCALE_CHANGE_CONFIRM				= 'Change language to %s and reload the game?'
-
 GUILD_MEMBER_COUNT_INFINITY 		= 'INFINITY'
 GUILD_MARK_MIN_LEVEL				= '3'
 GUILD_BUILDING_LIST_TXT				= '{:s}/GuildBuildingList.txt'.format(APP_GET_LOCALE_PATH)
diff --git a/assets/root/assassin_m.msm b/assets/root/msm/assassin_m.msm
similarity index 100%
rename from assets/root/assassin_m.msm
rename to assets/root/msm/assassin_m.msm
diff --git a/assets/root/assassin_w.msm b/assets/root/msm/assassin_w.msm
similarity index 100%
rename from assets/root/assassin_w.msm
rename to assets/root/msm/assassin_w.msm
diff --git a/assets/root/shaman_m.msm b/assets/root/msm/shaman_m.msm
similarity index 100%
rename from assets/root/shaman_m.msm
rename to assets/root/msm/shaman_m.msm
diff --git a/assets/root/shaman_w.msm b/assets/root/msm/shaman_w.msm
similarity index 100%
rename from assets/root/shaman_w.msm
rename to assets/root/msm/shaman_w.msm
diff --git a/assets/root/sura_m.msm b/assets/root/msm/sura_m.msm
similarity index 100%
rename from assets/root/sura_m.msm
rename to assets/root/msm/sura_m.msm
diff --git a/assets/root/sura_w.msm b/assets/root/msm/sura_w.msm
similarity index 100%
rename from assets/root/sura_w.msm
rename to assets/root/msm/sura_w.msm
diff --git a/assets/root/warrior_m.msm b/assets/root/msm/warrior_m.msm
similarity index 100%
rename from assets/root/warrior_m.msm
rename to assets/root/msm/warrior_m.msm
diff --git a/assets/root/warrior_w.msm b/assets/root/msm/warrior_w.msm
similarity index 100%
rename from assets/root/warrior_w.msm
rename to assets/root/msm/warrior_w.msm
diff --git a/assets/root/playersettingmodule.py b/assets/root/playersettingmodule.py
index b971bc34..bf174e8e 100644
--- a/assets/root/playersettingmodule.py
+++ b/assets/root/playersettingmodule.py
@@ -256,12 +256,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_WARRIOR_M)
 	chrmgr.SelectRace(RACE_WARRIOR_M)	
-	chrmgr.LoadLocalRaceData("warrior_m.msm")
+	chrmgr.LoadLocalRaceData("msm/warrior_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/warrior/intro/")
 
 	chrmgr.CreateRace(RACE_WARRIOR_W)
 	chrmgr.SelectRace(RACE_WARRIOR_W)	
-	chrmgr.LoadLocalRaceData("warrior_w.msm")
+	chrmgr.LoadLocalRaceData("msm/warrior_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/warrior/intro/")
 
 
@@ -270,12 +270,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_ASSASSIN_W)
 	chrmgr.SelectRace(RACE_ASSASSIN_W)
-	chrmgr.LoadLocalRaceData("assassin_w.msm")
+	chrmgr.LoadLocalRaceData("msm/assassin_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/assassin/intro/")
 
 	chrmgr.CreateRace(RACE_ASSASSIN_M)
 	chrmgr.SelectRace(RACE_ASSASSIN_M)
-	chrmgr.LoadLocalRaceData("assassin_m.msm")
+	chrmgr.LoadLocalRaceData("msm/assassin_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/assassin/intro/")
 
 
@@ -284,12 +284,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_SURA_M)
 	chrmgr.SelectRace(RACE_SURA_M)	
-	chrmgr.LoadLocalRaceData("sura_m.msm")
+	chrmgr.LoadLocalRaceData("msm/sura_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/sura/intro/")
 
 	chrmgr.CreateRace(RACE_SURA_W)
 	chrmgr.SelectRace(RACE_SURA_W)	
-	chrmgr.LoadLocalRaceData("sura_w.msm")
+	chrmgr.LoadLocalRaceData("msm/sura_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/sura/intro/")
 
 
@@ -298,12 +298,12 @@ def __InitData():
 	##############
 	chrmgr.CreateRace(RACE_SHAMAN_W)
 	chrmgr.SelectRace(RACE_SHAMAN_W)
-	chrmgr.LoadLocalRaceData("shaman_w.msm")
+	chrmgr.LoadLocalRaceData("msm/shaman_w.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc/shaman/intro/")
 
 	chrmgr.CreateRace(RACE_SHAMAN_M)
 	chrmgr.SelectRace(RACE_SHAMAN_M)
-	chrmgr.LoadLocalRaceData("shaman_m.msm")
+	chrmgr.LoadLocalRaceData("msm/shaman_m.msm")
 	SetIntroMotions(chr.MOTION_MODE_GENERAL, "d:/ymir work/pc2/shaman/intro/")
 
 
diff --git a/assets/uiscript/uiscript/loginwindow.py b/assets/uiscript/uiscript/loginwindow.py
index 1e2ffb88..3caf0386 100644
--- a/assets/uiscript/uiscript/loginwindow.py
+++ b/assets/uiscript/uiscript/loginwindow.py
@@ -6,11 +6,15 @@ ROOT_PATH = "d:/ymir work/ui/intro/"
 #Big-List
 #SERVER_BOARD_HEIGHT = 180 + 390
 #SERVER_LIST_HEIGHT = 171 + 350
+
 #Small list like german
 SERVER_BOARD_HEIGHT = 220 + 180
 SERVER_LIST_HEIGHT = 171 + 180
 SERVER_BOARD_WEIGHT = 375 
 
+ID_LIMIT_COUNT = 19
+PW_LIMIT_COUNT = 16
+
 window = {
 	"name" : "LoginWindow",
 	"sytle" : ("movable",),
@@ -556,22 +560,35 @@ window = {
 			"x" : (SCREEN_WIDTH - 208) / 2,
 			"y" : (SCREEN_HEIGHT - 410),
 
-			"image" : LOCALE_PATH + "loginwindow.sub",
+			"image" : "d:/ymir work/ui/intro/login/loginwindow.sub",
 
 			"children" :
 			(
+				{
+					"name" : "ID_Text_window", "type" : "window", "x" : 45, "y" : 4, "width" : 120, "height" : 18,
+					"children" :
+					(
+						{"name":"ID_Text", "type":"text", "x":0, "y":0, "text":uiScriptLocale.LOGIN_ID, "all_align" : "center"},
+					),
+				},
+				{
+					"name" : "Password_Text_window", "type" : "window", "x" : 45, "y" : 41, "width" : 120, "height" : 18,
+					"children" :
+					(
+						{"name":"Password_Text", "type":"text", "x":0, "y":0, "text":uiScriptLocale.LOGIN_PASSWORD, "all_align" : "center"},
+					),
+				},
 				{
 					"name" : "ID_EditLine",
 					"type" : "editline",
 
-					"x" : 77,
-					"y" : 16,
+					"x" : 48,
+					"y" : 23,
 
 					"width" : 120,
 					"height" : 18,
 
-					"input_limit" : 16,
-					"enable_codepage" : 0,
+					"input_limit" : ID_LIMIT_COUNT,
 
 					"r" : 1.0,
 					"g" : 1.0,
@@ -582,15 +599,14 @@ window = {
 					"name" : "Password_EditLine",
 					"type" : "editline",
 
-					"x" : 77,
-					"y" : 43,
+					"x" : 48,
+					"y" : 60,
 
 					"width" : 120,
 					"height" : 18,
 
-					"input_limit" : 16,
+					"input_limit" : PW_LIMIT_COUNT,
 					"secret_flag" : 1,
-					"enable_codepage" : 0,
 
 					"r" : 1.0,
 					"g" : 1.0,
@@ -602,7 +618,7 @@ window = {
 					"type" : "button",
 
 					"x" : 15,
-					"y" : 65,
+					"y" : 79,
 
 					"default_image" : "d:/ymir work/ui/public/large_button_01.sub",
 					"over_image" : "d:/ymir work/ui/public/large_button_02.sub",
@@ -615,7 +631,7 @@ window = {
 					"type" : "button",
 
 					"x" : 105,
-					"y" : 65,
+					"y" : 79,
 
 					"default_image" : "d:/ymir work/ui/public/large_button_01.sub",
 					"over_image" : "d:/ymir work/ui/public/large_button_02.sub",