diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index 1347591e4124..06633e78de4d 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -27,7 +27,7 @@
 
     <script type="text/javascript">
         var NINJA = NINJA || {};      
-        NINJA.isRegistered = {{ Utils::isRegistered() ? 'true' : 'false' }};    
+        NINJA.isRegistered = {{ \Utils::isRegistered() ? 'true' : 'false' }};    
 
         window.onerror = function(e) {
             var message = e.message ? (e.message + ' - ' + e.filename + ': ' + e.lineno) : e;
diff --git a/resources/views/users/forgot_password.blade.php b/resources/views/users/forgot_password.blade.php
index c40dae6a9cd0..4393ecec83f3 100644
--- a/resources/views/users/forgot_password.blade.php
+++ b/resources/views/users/forgot_password.blade.php
@@ -53,17 +53,17 @@
 @section('body')
 <div class="container">
 
-{{ Former::open('forgot_password')->rules(['email' => 'required|email'])->addClass('form-signin') }}
+{!! 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>
-        {{ Former::text('email')->placeholder(trans('texts.email_address'))->raw() }}
+        {!! Former::text('email')->placeholder(trans('texts.email_address'))->raw() !!}
     </p>
 
-    <p>{{ Button::success_submit(trans('texts.send_email'), array('class' => 'btn-lg'))->block() }}</p>
+    <p>{!! Button::normal(trans('texts.send_email'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
 
     <!-- if there are login errors, show them here -->
     @if (Session::has('warning'))
@@ -78,7 +78,7 @@
     <div class="alert alert-danger">{{ Session::get('error') }}</div>
     @endif
 
-    {{ Former::close() }}
+    {!! Former::close() !!}
 
 </div>
 </div>
diff --git a/resources/views/users/login.blade.php b/resources/views/users/login.blade.php
index 085575fd4350..d0dc37fd0cde 100644
--- a/resources/views/users/login.blade.php
+++ b/resources/views/users/login.blade.php
@@ -49,13 +49,13 @@
 
 </style>
 
-@stop
+@endsection
 
 @section('body')
 <div class="container">
 
 
-    {{ Former::open('login')->rules(['login_email' => 'required|email', 'login_password' => 'required'])->addClass('form-signin') }}
+    {!! 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>
@@ -66,14 +66,14 @@
             </p>
 
             <p>
-                {{ Former::text('login_email')->placeholder(trans('texts.email_address'))->raw() }}
-                {{ Former::password('login_password')->placeholder(trans('texts.password'))->raw() }}
+                {!! Former::text('login_email')->placeholder(trans('texts.email_address'))->raw() !!}
+                {!! Former::password('login_password')->placeholder(trans('texts.password'))->raw() !!}
             </p>
 
-            <p>{{ Button::success_submit(trans('texts.lets_go'), array('class' => 'btn-lg'))->block() }}</p>
+            <p>{!! Button::primary(trans('texts.lets_go'))->withAttributes(array('class' => 'btn-lg'))->submit()->block() !!}</p>
             
             <p class="link">
-                {{ link_to('forgot_password', trans('texts.forgot_password')) }}
+                {!! link_to('forgot_password', trans('texts.forgot_password')) !!}
             </p>
 
 
@@ -91,7 +91,7 @@
 
         </div>
 
-        {{ Former::close() }}
+        {!! Former::close() !!}
 
         @if (!Utils::isNinja())
         <p/>
@@ -116,4 +116,4 @@
 
     </div>
 
-    @stop
\ No newline at end of file
+    @endsection
\ No newline at end of file