diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
index a4c703d..b479620 100644
--- a/src/Commands/InstallCommand.php
+++ b/src/Commands/InstallCommand.php
@@ -57,9 +57,9 @@ protected function createAdminUser(): void
             'email' => 'required|email|max:150',
             'password' => 'required|max:32|min:6'
         ], [], [
-            'name' => trans('juzaweb::app.name'),
-            'email' => trans('juzaweb::app.email'),
-            'password' => trans('juzaweb::app.password')
+            'name' => trans('installer::message.environment.wizard.form.name'),
+            'email' => trans('installer::message.environment.wizard.form.email'),
+            'password' => trans('installer::message.environment.wizard.form.password')
         ]);
 
         if ($validator->fails()) {
diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php
index b5d43f5..51f9ed6 100644
--- a/src/Http/Controllers/AdminController.php
+++ b/src/Http/Controllers/AdminController.php
@@ -36,10 +36,10 @@ public function save(Request $request)
             'password' => 'required|max:32|min:8|confirmed',
             'password_confirmation' => 'required|max:32|min:8',
         ], [], [
-            'name' => trans('juzaweb::app.name'),
-            'email' => trans('juzaweb::app.email'),
-            'password' => trans('juzaweb::app.password'),
-            'password_confirmation' => trans('juzaweb::app.confirm_password')
+            'name' => trans('installer::message.environment.wizard.form.name'),
+            'email' => trans('installer::message.environment.wizard.form.email'),
+            'password' => trans('installer::message.environment.wizard.form.password'),
+            'password_confirmation' => trans('installer::message.environment.wizard.form.password_confirmation')
         ]);
 
         if ($validator->fails()) {
diff --git a/src/resources/lang/en/message.php b/src/resources/lang/en/message.php
index b92d42e..bbf7852 100644
--- a/src/resources/lang/en/message.php
+++ b/src/resources/lang/en/message.php
@@ -5,6 +5,7 @@
     'next' => 'Next Step',
     'back' => 'Previous',
     'finish' => 'Install',
+    'please_wait' => 'Please Wait...',
     'forms' => [
         'error_title' => 'The Following errors occurred:',
     ],
@@ -122,11 +123,11 @@
 
                     'pusher_label' => 'Pusher',
                     'pusher_app_id_label' => 'Pusher App Id',
-                    'pusher_app_id_palceholder' => 'Pusher App Id',
+                    'pusher_app_id_placeholder' => 'Pusher App Id',
                     'pusher_app_key_label' => 'Pusher App Key',
-                    'pusher_app_key_palceholder' => 'Pusher App Key',
+                    'pusher_app_key_placeholder' => 'Pusher App Key',
                     'pusher_app_secret_label' => 'Pusher App Secret',
-                    'pusher_app_secret_palceholder' => 'Pusher App Secret',
+                    'pusher_app_secret_placeholder' => 'Pusher App Secret',
                 ],
                 'buttons' => [
                     'setup_database' => 'Setup Database',
diff --git a/src/resources/views/admin.blade.php b/src/resources/views/admin.blade.php
index e9f2e8b..e74931b 100644
--- a/src/resources/views/admin.blade.php
+++ b/src/resources/views/admin.blade.php
@@ -79,7 +79,7 @@
     <script type="text/javascript">
         $('form').on('submit', function () {
             $('.btn-submit')
-                .html("{{ trans('juzaweb::app.please_wait') }}")
+                .html("{{ trans('installer::message.please_wait') }}")
                 .prop('disabled', true);
         });
     </script>
diff --git a/src/resources/views/environment.blade.php b/src/resources/views/environment.blade.php
index 119a947..b215b9f 100644
--- a/src/resources/views/environment.blade.php
+++ b/src/resources/views/environment.blade.php
@@ -134,7 +134,7 @@ function showApplicationSettings() {
 
         $('form').on('submit', function() {
             $('.btn-submit')
-                .html("{{ trans('juzaweb::app.please_wait') }}")
+                .html("{{ trans('installer::message.please_wait') }}")
                 .prop('disabled', true);
         });
     </script>