diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php
index f80e354f8326..95d9bc55e434 100644
--- a/app/lang/da/texts.php
+++ b/app/lang/da/texts.php
@@ -569,5 +569,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
   
 );
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index bd682f3150c8..c5bad5e52b8d 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -560,6 +560,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
 
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index c14670739451..d51f8d57d6ef 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -567,6 +567,14 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
   
   
 );
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index a540e47e39ca..72ecabaecddc 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -539,6 +539,14 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
 
 
 );
\ No newline at end of file
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index e304cad8b6c0..859397a224e0 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -560,6 +560,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
 
 );
\ No newline at end of file
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index e4dcb5e926bc..04146d23af11 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -562,6 +562,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
     
 );
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index 943194ac8672..6a071202257b 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -570,6 +570,14 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
 
     
 );
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index 80d4b6cc58ce..ff3921d026c7 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -568,6 +568,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
   
 );
\ No newline at end of file
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 8cb6331b7e1f..3880755f71e6 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -563,7 +563,14 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
 
   
 );
\ No newline at end of file
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index 28ac859e91f1..61c16d760062 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -551,6 +551,13 @@ return array(
 
   'api_tokens' => 'API Tokens',
   'users_and_tokens' => 'Users & Tokens',
-
+  'account_login' => 'Account Login',
+  'recover_password' => 'Recover your password',
+  'forgot_password' => 'Forgot your password?',
+  'email_address' => 'Email address',
+  'lets_go' => 'Let’s go',
+  'password_recovery' => 'Password Recovery',
+  'send_email' => 'Send email',
+  'set_password' => 'Set Password',
   
 );
diff --git a/app/views/users/forgot_password.blade.php b/app/views/users/forgot_password.blade.php
index 2a87498096dd..c40dae6a9cd0 100755
--- a/app/views/users/forgot_password.blade.php
+++ b/app/views/users/forgot_password.blade.php
@@ -2,77 +2,85 @@
 
 @section('head')	
 
-	  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
 
-    <style type="text/css">
-		body {
-		  padding-top: 40px;
-		  padding-bottom: 40px;
-		  background-color: #eee !important;
-		}
-
-		.form-signin {
-		  max-width: 330px;
-		  padding: 15px;
-		  margin: 0 auto;
-		}
-		.form-signin .form-signin-heading,
-		.form-signin .checkbox {
-		  margin-bottom: 10px;
-		}
-		.form-signin .checkbox {
-		  font-weight: normal;
-		}
-		.form-signin .form-control {
-		  position: relative;
-		  font-size: 16px;
-		  height: auto;
-		  padding: 10px;
-		  -webkit-box-sizing: border-box;
-		     -moz-box-sizing: border-box;
-		          box-sizing: border-box;
-		}
-		.form-signin .form-control:focus {
-		  z-index: 2;
-		}
-		.form-signin input[type="text"] {
-		  margin-bottom: -1px;
-		  border-bottom-left-radius: 0;
-		  border-bottom-right-radius: 0;
-		}
-		.form-signin input[type="password"] {
-		  margin-bottom: 10px;
-		  border-top-left-radius: 0;
-		  border-top-right-radius: 0;
-		}
-    </style>
+<style type="text/css">
+    body {
+        padding-top: 40px;
+        padding-bottom: 40px;
+    }
+    .modal-header {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+    }
+    .modal-header h4 {
+        margin:0;
+    }
+    .modal-header img {
+        float: left; 
+        margin-right: 20px;
+    }
+    .form-signin {
+        max-width: 400px;
+        margin: 0 auto;
+        background: #fff;
+    }
+    p.link a {
+        font-size: 11px;
+    }
+    .form-signin .inner {
+        padding: 20px;
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+        border-left: 1px solid #ddd;
+        border-right: 1px solid #ddd;
+        border-bottom: 1px solid #ddd;
+    }
+    .form-signin .checkbox {
+        font-weight: normal;
+    }
+    .form-signin .form-control {
+        margin-bottom: 17px !important;
+    }
+    .form-signin .form-control:focus {
+        z-index: 2;
+    }
+</style>
 
 @stop
 
 @section('body')
-    <div class="container">
+<div class="container">
 
-		{{ Former::open('forgot_password')->addClass('form-signin') }}
-			<h2 class="form-signin-heading">Password Recovery</h2>
+{{ Former::open('forgot_password')->rules(['email' => 'required|email'])->addClass('form-signin') }}
+  <div class="modal-header">
+    <img src="{{ asset('images/icon-login.png') }}" />
+    <h4>Invoice Ninja | {{ trans('texts.password_recovery') }}</h4></div>
+    <div class="inner">
 
-			<p>
-				{{ Form::text('email', Input::old('email'), array('placeholder' => 'Email address')) }}
-			</p>
+      <p>
+        {{ Former::text('email')->placeholder(trans('texts.email_address'))->raw() }}
+    </p>
 
-			<p>{{ Button::primary_submit('Send email', array('class' => 'btn-lg'))->block() }}</p>
-		
-			<!-- if there are login errors, show them here -->
-			@if ( Session::get('error') )
-            	<div class="alert alert-error">{{{ Session::get('error') }}}</div>
-        	@endif
+    <p>{{ Button::success_submit(trans('texts.send_email'), array('class' => 'btn-lg'))->block() }}</p>
 
-	        @if ( Session::get('notice') )
-    	        <div class="alert">{{{ Session::get('notice') }}}</div>
-	        @endif
+    <!-- if there are login errors, show them here -->
+    @if (Session::has('warning'))
+    <div class="alert alert-warning">{{ Session::get('warning') }}</div>
+    @endif
 
+    @if (Session::has('message'))
+    <div class="alert alert-info">{{ Session::get('message') }}</div>
+    @endif
 
-		{{ Former::close() }}
+    @if (Session::has('error'))
+    <div class="alert alert-danger">{{ Session::get('error') }}</div>
+    @endif
 
-    </div>
+    {{ Former::close() }}
+
+</div>
+</div>
 
 @stop
\ No newline at end of file
diff --git a/app/views/users/login.blade.php b/app/views/users/login.blade.php
index 9ef2bb890094..23e90644107a 100755
--- a/app/views/users/login.blade.php
+++ b/app/views/users/login.blade.php
@@ -2,101 +2,106 @@
 
 @section('head')	
 
-  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
-  <link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
+<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
 
-  <style type="text/css">
-		body {
-		  padding-top: 40px;
-		  padding-bottom: 40px;
-		}
-       .modal-header {
-          border-top-left-radius: 3px;
-          border-top-right-radius: 3px;
-       }
-       .modal-header h4 {
-          margin:0;
-       }
-       .modal-header img {
-          float: left; 
-          margin-right: 20px;
-       }
-       .form-signin {
-		  max-width: 400px;
-		  margin: 0 auto;
-          background: #fff;
-       }
-       p.link a {
-          font-size: 11px;
-       }
-       .form-signin .inner {
-		  padding: 20px;
-          border-bottom-right-radius: 3px;
-          border-bottom-left-radius: 3px;
-          border-left: 1px solid #ddd;
-          border-right: 1px solid #ddd;
-          border-bottom: 1px solid #ddd;
-		}
-		.form-signin .checkbox {
-		  font-weight: normal;
-		}
-		.form-signin .form-control {
-		 margin-bottom: 17px !important;
-		}
-		.form-signin .form-control:focus {
-		  z-index: 2;
-		}
-		
-  </style>
+<style type="text/css">
+    body {
+        padding-top: 40px;
+        padding-bottom: 40px;
+    }
+    .modal-header {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+    }
+    .modal-header h4 {
+        margin:0;
+    }
+    .modal-header img {
+        float: left; 
+        margin-right: 20px;
+    }
+    .form-signin {
+        max-width: 400px;
+        margin: 0 auto;
+        background: #fff;
+    }
+    p.link a {
+        font-size: 11px;
+    }
+    .form-signin .inner {
+        padding: 20px;
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+        border-left: 1px solid #ddd;
+        border-right: 1px solid #ddd;
+        border-bottom: 1px solid #ddd;
+    }
+    .form-signin .checkbox {
+        font-weight: normal;
+    }
+    .form-signin .form-control {
+        margin-bottom: 17px !important;
+    }
+    .form-signin .form-control:focus {
+        z-index: 2;
+    }
+
+</style>
 
 @stop
 
 @section('body')
-    <div class="container">
+<div class="container">
 
-		{{ Former::open('login')->addClass('form-signin') }}
-			<div class="modal-header">
-                <img src="{{ asset('images/icon-login.png') }}" />
-                <h4>Invoice Ninja Account Login</h4></div>
-            <div class="inner">
-			<p>
-				{{ $errors->first('login_email') }}
-				{{ $errors->first('login_password') }}
-			</p>
 
-			<p>
-				{{ Form::text('login_email', Input::old('login_email'), array('placeholder' => 'Email address')) }}
-				{{ Form::password('login_password', array('placeholder' => 'Password')) }}
-			</p>
-
-			<p>{{ Button::success_submit('Let’s go', array('class' => 'btn-lg'))->block() }}</p>
-            <p class="link">
-			{{ link_to('forgot_password', 'Forgot your password?') }}
+    {{ Former::open('login')->rules(['login_email' => 'required|email', 'login_password' => 'required'])->addClass('form-signin') }}
+    <div class="modal-header">
+        <img src="{{ asset('images/icon-login.png') }}" />
+        <h4>Invoice Ninja | {{ trans('texts.account_login') }}</h4></div>
+        <div class="inner">
+            <p>
+                {{ $errors->first('login_email') }}
+                {{ $errors->first('login_password') }}
             </p>
 
-		
-			<!-- if there are login errors, show them here -->
-			@if ( Session::get('error') )
-            	<div class="alert alert-error">{{{ Session::get('error') }}}</div>
-        	@endif
+            <p>
+                {{ Former::text('login_email')->placeholder(trans('texts.email_address'))->raw() }}
+                {{ Former::password('login_password')->placeholder(trans('texts.password'))->raw() }}
+            </p>
 
-	        @if ( Session::get('notice') )
-    	        <div class="alert">{{{ Session::get('notice') }}}</div>
-	        @endif
-            </div>
+            <p>{{ Button::success_submit(trans('texts.lets_go'), array('class' => 'btn-lg'))->block() }}</p>
+            <p class="link">
+                {{ link_to('forgot_password', trans('texts.forgot_password')) }}
+            </p>
 
-		{{ Former::close() }}
+
+            @if (Session::has('warning'))
+            <div class="alert alert-warning">{{ Session::get('warning') }}</div>
+            @endif
+
+            @if (Session::has('message'))
+            <div class="alert alert-info">{{ Session::get('message') }}</div>
+            @endif
+
+            @if (Session::has('error'))
+            <div class="alert alert-danger">{{ Session::get('error') }}</div>
+            @endif
+
+        </div>
+
+        {{ Former::close() }}
 
         @if (!Utils::isNinja())
-            <p/>
-            <center>
+        <p/>
+        <center>
             <div id="fb-root"></div>
             <script>(function(d, s, id) {
-              var js, fjs = d.getElementsByTagName(s)[0];
-              if (d.getElementById(id)) return;
-              js = d.createElement(s); js.id = id;
-              js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-              fjs.parentNode.insertBefore(js, fjs);
+                var js, fjs = d.getElementsByTagName(s)[0];
+                if (d.getElementById(id)) return;
+                js = d.createElement(s); js.id = id;
+                js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
+                fjs.parentNode.insertBefore(js, fjs);
             }(document, 'script', 'facebook-jssdk'));</script>
 
             <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
@@ -105,9 +110,9 @@
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 
             <iframe src="https://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=star&count=false" frameborder="0" scrolling="0" width="50px" height="20px"></iframe>
-            </center>
+        </center>
         @endif
 
     </div>
 
-@stop
\ No newline at end of file
+    @stop
\ No newline at end of file
diff --git a/app/views/users/reset_password.blade.php b/app/views/users/reset_password.blade.php
index 0f709c6c71fc..1c4e7750b503 100755
--- a/app/views/users/reset_password.blade.php
+++ b/app/views/users/reset_password.blade.php
@@ -2,84 +2,94 @@
 
 @section('head')	
 
-	  <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>    
 
-    <style type="text/css">
-		body {
-		  padding-top: 40px;
-		  padding-bottom: 40px;
-		  background-color: #eee !important;
-		}
-
-		.form-signin {
-		  max-width: 450px;
-		  padding: 15px;
-		  margin: 0 auto;
-		}
-		.form-signin .form-signin-heading,
-		.form-signin .checkbox {
-		  margin-bottom: 10px;
-		}
-		.form-signin .checkbox {
-		  font-weight: normal;
-		}
-		.form-signin .form-control {
-		  position: relative;
-		  font-size: 16px;
-		  height: auto;
-		  padding: 10px;
-		  -webkit-box-sizing: border-box;
-		     -moz-box-sizing: border-box;
-		          box-sizing: border-box;
-		}
-		.form-signin .form-control:focus {
-		  z-index: 2;
-		}
-		.form-signin input[type="text"] {
-		  margin-bottom: -1px;
-		  border-bottom-left-radius: 0;
-		  border-bottom-right-radius: 0;
-		}
-		.form-signin input[type="password"] {
-		  margin-bottom: 10px;
-		  border-top-left-radius: 0;
-		  border-top-right-radius: 0;
-		}
-    </style>
+<style type="text/css">
+    body {
+        padding-top: 40px;
+        padding-bottom: 40px;
+    }
+    .modal-header {
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+    }
+    .modal-header h4 {
+        margin:0;
+    }
+    .modal-header img {
+        float: left; 
+        margin-right: 20px;
+    }
+    .form-signin {
+        max-width: 400px;
+        margin: 0 auto;
+        background: #fff;
+    }
+    p.link a {
+        font-size: 11px;
+    }
+    .form-signin .inner {
+        padding: 20px;
+        border-bottom-right-radius: 3px;
+        border-bottom-left-radius: 3px;
+        border-left: 1px solid #ddd;
+        border-right: 1px solid #ddd;
+        border-bottom: 1px solid #ddd;
+    }
+    .form-signin .checkbox {
+        font-weight: normal;
+    }
+    .form-signin .form-control {
+        margin-bottom: 17px !important;
+    }
+    .form-signin .form-control:focus {
+        z-index: 2;
+    }
+</style>
 
 @stop
 
 @section('body')
-    <div class="container">
+<div class="container">
 
-		{{ Former::open('user/reset')->addClass('form-signin')->rules(array(
-	        'password' => 'required',
-	        'password_confirmation' => 'required',        
-		)); }}
+  {{ Former::open('user/reset')->addClass('form-signin')->rules(array(
+  'password' => 'required',
+  'password_confirmation' => 'required',        
+  )); }}
 
-			<h2 class="form-signin-heading">Set Password</h2><p/>&nbsp;
-    	<input type="hidden" name="token" value="{{{ $token }}}">
+  <div class="modal-header">
+    <img src="{{ asset('images/icon-login.png') }}" />
+    <h4>Invoice Ninja | {{ trans('texts.set_password') }}</h4></div>
+    <div class="inner">
 
-			<p>
-				{{ Former::password('password') }}				
-				{{ Former::password('password_confirmation')->label('Confirm') }}				
-				
-			</p>
+      <input type="hidden" name="token" value="{{{ $token }}}">
 
-			<p>{{ Button::primary_submit('Save', array('class' => 'btn-lg'))->block() }}</p>
-		
-			<!-- if there are login errors, show them here -->
-			@if ( Session::get('error') )
-            	<div class="alert alert-error">{{{ Session::get('error') }}}</div>
-        	@endif
+      <p>
+        {{ Former::password('password')->placeholder(trans('texts.password'))->raw() }}				
+        {{ Former::password('password_confirmation')->placeholder(trans('texts.confirm_password'))->raw() }}				
 
-	        @if ( Session::get('notice') )
-    	        <div class="alert">{{{ Session::get('notice') }}}</div>
-	        @endif
+    </p>
+
+    <p>{{ Button::success_submit(trans('texts.save'), array('class' => 'btn-lg'))->block() }}</p>
+
+    <!-- if there are login errors, show them here -->
+    @if (Session::has('warning'))
+    <div class="alert alert-warning">{{ Session::get('warning') }}</div>
+    @endif
+
+    @if (Session::has('message'))
+    <div class="alert alert-info">{{ Session::get('message') }}</div>
+    @endif
+
+    @if (Session::has('error'))
+    <div class="alert alert-danger">{{ Session::get('error') }}</div>
+    @endif
 
 
-		{{ Former::close() }}
+    {{ Former::close() }}
+</div>
 
-    </div>
+</div>
 
 @stop
\ No newline at end of file