diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css
index e6eb89a55..2b5f54606 100644
--- a/addons/default/visiosoft/base-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/base-theme/resources/css/theme.css
@@ -17,4 +17,22 @@
     background-repeat: no-repeat;
     height: 50px;
     width: 100%;
+}
+
+@media only screen and (min-width: 960px) {
+    .login-section,
+    .register-section {
+        padding: 100px 50px;
+    }
+}
+
+.login-section,
+.register-section {
+    border: 1px solid #dfdfdf;
+}
+
+.login-section button, .login-section a,
+.register-section button,
+.register-section a {
+    font-size: 16px;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/button.php b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
index 7ae9963c2..1337b4c22 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
@@ -6,4 +6,6 @@ return [
     ],
     'login' => 'Login',
     'register' => 'Register',
+    'continue' => 'Continue',
+    'reset_password' => 'Reset Password',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index db04bc683..554f5262f 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -13,8 +13,13 @@ return [
     ],
     'profile' => 'Profile',
     'email' => 'Email Address',
+    'reset_code' => 'Reset Code',
+    'password_confirmation' => 'Password Confirmation',
     'password' => 'Password',
     'display_name' => 'Display Name',
     'username' => 'Username',
     'remember_me' => 'Remember Me',
+    'not_a_member_yet' => 'Not a Member Yet',
+    'not_a_member_yet_message' => 'Sign up for our members to benefit from our special service',
+    'forgot_password' => 'I Forgot My Password',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
index a3d4b6275..8c74b4a91 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
@@ -6,4 +6,6 @@ return [
     ],
     'login' => 'Giriş Yap',
     'register' => 'Üye Ol',
+    'continue' => 'Devam',
+    'reset_password' => 'Şifremi Güncelle',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index ad12a66df..a835db2e3 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -13,8 +13,13 @@ return [
     ],
     'profile' => 'Profile',
     'email' => 'Email Adresiniz',
+    'reset_code' => 'Sıfırlama Kodu',
+    'password_confirmation' => 'Şifrenizi Onaylayın',
     'password' => 'Şifreniz',
     'display_name' => 'İsim Soyisim',
     'username' => 'Kullanıcı Adı',
     'remember_me' => 'Beni Hatırla',
+    'not_a_member_yet' => 'Henüz Üye Değil Misiniz',
+    'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun',
+    'forgot_password' => 'Şifremi Unuttum',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
index af8895839..4d9117692 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig
@@ -2,63 +2,85 @@
 
 {% block content %}
     <div class="row justify-content-center">
-        <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
-            {% set form = form('login')
-                .redirect(app.request.get('redirect'))
-                .get() %}
-            {{ form_open({
-                'class':'aaa',
-                'url':form.options.url
-            })|raw }}
-            <div class="col-12">
-                <div class="form-group email-field email-field_type">
-                    <label class="control-label">
-                        {{ trans('visiosoft.theme.base::field.email') }}
-                        <span class="required">*</span>
-                    </label>
+        <div class="col-12 text-left p-3 m-0 row justify-content-center">
 
-                    <div class="input-wrapper">
-                        {{ form.fields.email.input|raw }}
+            <div class="col-12 col-lg-5 m-3 login-section">
+                {% set form = form('login')
+                    .redirect(app.request.get('redirect'))
+                    .get() %}
+                {{ form_open({
+                    'class':'aaa',
+                    'url':form.options.url
+                })|raw }}
+                <div class="col-12 pt-4 pt-lg-0">
+                    <h5 class="text-center">
+                        {{ trans('visiosoft.theme.base::button.login') }}
+                    </h5>
+                    <div class="form-group email-field email-field_type">
+                        <label class="control-label">
+                            {{ trans('visiosoft.theme.base::field.email') }}
+                            <span class="required">*</span>
+                        </label>
+
+                        <div class="input-wrapper">
+                            {{ form.fields.email.input|raw }}
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-12">
-                <div class="form-group password-field password-field_type">
-                    <label class="control-label">
-                        {{ trans('visiosoft.theme.base::field.password') }}
-                        <span class="required">*</span>
-                    </label>
+                <div class="col-12">
+                    <div class="form-group password-field password-field_type">
+                        <div class="col-12 p-0 row m-0">
+                            <div class="col-6 p-0">
+                                <label class="control-label">
+                                    {{ trans('visiosoft.theme.base::field.password') }}
+                                    <span class="required">*</span>
+                                </label>
+                            </div>
+                            <div class="col-6 p-0 text-right">
+                                <a href="{{ url_route('anomaly.module.users::password.forgot') }}">
+                                    <small class="text-muted">
+                                        {{ trans('visiosoft.theme.base::field.forgot_password') }}
+                                    </small>
+                                </a>
+                            </div>
+                        </div>
 
-                    <div class="input-wrapper">
-                        {{ form.fields.password.input|raw }}
+                        <div class="input-wrapper">
+                            {{ form.fields.password.input|raw }}
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-12">
-                <label class="c-input c-checkbox">
-                    <input value="0" type="hidden" name="remember_me">
-                    <input type="checkbox" name="remember_me">
-                    <span class="c-indicator"></span>
-                    {{ trans('visiosoft.theme.base::field.remember_me') }}
-                </label>
-            </div>
-            <div class="col-12 row m-0">
-                <div class="col-6 pr-0 pl-1">
-                    <button class="btn btn-sm btn-primary  w-100 py-2">
+                <div class="col-12 row m-0 pb-4 pb-lg-0">
+                    <button class="btn btn-sm btn-primary font-weight-bolder w-100 py-3">
                         <i class="fas fa-key"></i>
                         {{ trans('visiosoft.theme.base::button.login') }}
                     </button>
                 </div>
-                <div class="col-6 pr-0 pl-1">
-                    <a href="{{ url('register') }}" class="btn btn-sm btn-success  w-100 py-2">
+                <div class="col-12 py-2">
+                    <label class="c-input c-checkbox">
+                        <input value="0" type="hidden" name="remember_me">
+                        <input type="checkbox" name="remember_me">
+                        <span class="c-indicator"></span>
+                        {{ trans('visiosoft.theme.base::field.remember_me') }}
+                    </label>
+                </div>
+                <div class="social-login py-2 row">
+                    {{ addBlock('login/oauth')|raw }}
+                </div>
+            </div>
+
+
+            <div class="col-12 col-lg-5 m-3 py-4 row register-section align-items-center">
+                <div class="col-12 text-center">
+                    <h3 class="py-2">{{ trans('visiosoft.theme.base::field.not_a_member_yet') }}?</h3>
+                    <p class="py-2">{{ trans('visiosoft.theme.base::field.not_a_member_yet_message') }}.</p>
+                    <a href="{{ url('register') }}"
+                       class="btn btn-sm btn-white font-weight-bolder border text-primary w-100 py-3 mt-1">
                         <i class="fas fa-user-plus"></i>
                         {{ trans('visiosoft.theme.base::button.register') }}
                     </a>
                 </div>
             </div>
-            <div class="social-login py-2 row">
-                {{ addBlock('login/oauth')|raw }}
-            </div>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/forgot.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/forgot.twig
new file mode 100644
index 000000000..32d4d28eb
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/forgot.twig
@@ -0,0 +1,35 @@
+{% extends "theme::layouts/default" %}
+
+{% block content %}
+    <div class="row justify-content-center">
+        <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
+            {% set form = form('forgot_password').redirect(request_get('redirect', '/'))
+                .get() %}
+            {{ form_open({
+                'class': 'row form ' ~ form.options.class ,
+                'url':form.options.url
+            })|raw }}
+
+
+            <div class="col-12">
+                <h4>{{ trans('visiosoft.theme.base::field.forgot_password') }}</h4>
+                <div class="form-group email-field email-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.email') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.email.input|raw }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12 row m-0">
+                <button class="btn btn-sm btn-primary  w-100 py-2">
+                    {{ trans('visiosoft.theme.base::button.continue') }}
+                </button>
+            </div>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/reset.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/reset.twig
new file mode 100644
index 000000000..0e7a28d3a
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/password/reset.twig
@@ -0,0 +1,71 @@
+{% extends "theme::layouts/default" %}
+
+{% block content %}
+    <div class="row justify-content-center">
+        <div class="col-12 col-sm-8 col-md-6 col-lg-4 text-left bg-light p-3 m-0">
+            {% set form = form('reset_password').redirect(request_get('redirect', '/'))
+                .get() %}
+            {{ form_open({
+                'class': 'row form ' ~ form.options.class ,
+                'url':form.options.url
+            })|raw }}
+
+
+            <div class="col-12">
+                <h4>{{ trans('visiosoft.theme.base::button.reset_password') }}</h4>
+                <div class="form-group email-field email-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.email') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.email.input|raw }}
+                    </div>
+                </div>
+            </div>
+            <div class="col-12">
+                <div class="form-group email-field code-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.reset_code') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.code.input|raw }}
+                    </div>
+                </div>
+            </div>
+            <div class="col-12">
+                <div class="form-group email-field password-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.password') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.password.input|raw }}
+                    </div>
+                </div>
+            </div>
+            <div class="col-12">
+                <div class="form-group email-field password_confirmation-field_type">
+                    <label class="control-label">
+                        {{ trans('visiosoft.theme.base::field.password_confirmation') }}
+                        <span class="required">*</span>
+                    </label>
+
+                    <div class="input-wrapper">
+                        {{ form.fields.password_confirmation.input|raw }}
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12 row m-0">
+                <button class="btn btn-sm btn-primary  w-100 py-2">
+                    {{ trans('visiosoft.theme.base::button.reset_password') }}
+                </button>
+            </div>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig b/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
index 0c9bc504c..15e9dc220 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/footer.twig
@@ -1,8 +1,5 @@
 <footer id="footer">
     <div class="container text-center text-muted">
-
-        {#&copy;{{ 'now'|date('Y') }} {{ setting_value('streams::name', 'Your Site') }}, All rights reserved.#}
-        &copy;{{ 'now'|date('Y') }} Your Company, All rights reserved.
-
+        &copy;{{ 'now'|date('Y') }} {{ setting_value('streams::name', 'Your Site') }}, All rights reserved.
     </div>
 </footer>