diff --git a/config/app.php b/config/app.php
index d14ca91..122b42b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -12,7 +12,7 @@ return [
     | any other location as required by the application or its packages.
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('STORE_NAME', 'Laravel'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php
index 505debd..8caabc8 100644
--- a/resources/lang/id/auth.php
+++ b/resources/lang/id/auth.php
@@ -25,4 +25,6 @@ return [
     'old_password_success'      => 'Password berhasil diubah!',
     'welcome_please_login'      => 'Selamat datang, silakan login',
     'welcome'                   => 'Selamat datang kembali :name.',
+    'login_welcome'             => 'Selamat datang di aplikasi <br><strong>:app_name</strong>',
+    'login_notes'               => 'Silakan login untuk melanjutkan aktifitas Anda.',
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 0e48945..fce08eb 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,24 +1,23 @@
 @extends('layouts.guest')
 
-@section('title', 'Login')
+@section('title', __('auth.login'))
 
 @section('content')
 <div class="login-page">
     <div class="row">
-        {{-- <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3"> --}}
         <div class="login-form">
             <p class="text-center lead">
-                Selamat datang di aplikasi <br><strong>{{ config('app.name') }}</strong>
+                {!! __('auth.login_welcome', ['app_name' => env('STORE_NAME')]) !!}
             </p>
-            <p class="text-center">Silakan login untuk melanjutkan aktifitas Anda.</p>
+            <p class="text-center">{{ __('auth.login_notes') }}</p>
             <div class="panel panel-default">
-                <div class="panel-heading"><h3 class="panel-title text-center">Login</strong></h3></div>
+                <div class="panel-heading"><h3 class="panel-title text-center">{{ __('auth.login') }}</h3></div>
                 <div class="panel-body">
                     <form class="form-horizontal" role="form" method="POST" action="{{ route('login') }}">
                         {{ csrf_field() }}
 
                         <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
-                            <label for="username" class="col-md-4 control-label">Username</label>
+                            <label for="username" class="col-md-4 control-label">{{ __('auth.username') }}</label>
 
                             <div class="col-md-8">
                                 <input id="username" type="text" class="form-control" name="username" value="{{ old('username') }}" required autofocus>
@@ -31,7 +30,7 @@
                         </div>
 
                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label for="password" class="col-md-4 control-label">Password</label>
+                            <label for="password" class="col-md-4 control-label">{{ __('auth.password') }}</label>
 
                             <div class="col-md-8">
                                 <input id="password" type="password" class="form-control" name="password" required>
@@ -46,8 +45,8 @@
 
                         <div class="form-group">
                             <div class="col-md-8 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary btn-block">
-                                    Login
+                                <button type="submit" class="btn btn-success btn-block">
+                                    {{ __('auth.login') }}
                                 </button>
                             </div>
                         </div>
@@ -60,4 +59,4 @@
 @endsection
 @section('ext_css')
 {{ Html::style('css/login.css') }}
-@endsection
\ No newline at end of file
+@endsection