diff --git a/index.tpl b/index.tpl
index ea99eb3..fc912c4 100644
--- a/index.tpl
+++ b/index.tpl
@@ -20,7 +20,7 @@
         <input id="username" name="username" value="{{ get('username', '') }}" type="text" required autofocus>
 
         <label for="password">{{ str['pwd'] }}</label>
-        <input id="password" name="password" type="password" required>
+        <input id="password" name="password" type="password" pattern="^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,24}$" required>
 
         <button class="green" type="submit">{{str['login']}}</button>
         <a href="/signup">{{ str['or-sign-up'] }}</a>
diff --git a/libs/localization.py b/libs/localization.py
index 077403d..6322f98 100644
--- a/libs/localization.py
+++ b/libs/localization.py
@@ -4,6 +4,8 @@ class LocalizeTo(object):
     """docstring for Session"""
     def __init__(self, lang, conf):
         super(LocalizeTo, self).__init__()
+        if not os.path.isdir(conf['locale']['dir'] + "/" + lang):
+            lang = conf['locale']['lang']
         translate = gettext.translation('base', localedir=conf['locale']['dir'], languages=[lang])
         translate.install()
         _ = translate.gettext
diff --git a/signup.tpl b/signup.tpl
index a110e8b..eb542bf 100644
--- a/signup.tpl
+++ b/signup.tpl
@@ -37,7 +37,7 @@
 
         <label for="confirm-password">{{ str['conf-pwd'] }}</label>
         <input id="confirm-password" name="confirm-password" type="password"
-            pattern=".{8,}" oninvalid="SetCustomValidity('Password must be at least 8 characters long.')" required>
+            pattern="^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,24}$" oninvalid="SetCustomValidity('Password must contain at least 8 characters, one number, uppercase and lowercase letters and special characters.')" required>
 
         <button class="green" type="submit">{{ str['sign-up'] }}</button>
         <a href="/">{{ str['or-sign-in'] }}</a>