diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index c1cd44e8..8430aa54 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -108,8 +108,14 @@ class AdminController extends Controller
             $form->text('site_url')
                 ->hint()
                 ->format(function ($url) {
-                    if (ends_with($url, '/'))
+                    if (ends_with($url, '/')) {
                         $url = substr($url, 0, -1);
+                    }
+
+                    if (ends_with($url, '/index.php')) {
+                        $url = substr($url, 0, -10);
+                    }
+
                     return $url;
                 });
 
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 6c7e4f9b..83e49e8a 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -57,7 +57,14 @@ class SetupController extends Controller
         Log::info("[SetupWizard] Tables migrated.");
 
         Option::set('site_name', $request->input('site_name'));
-        Option::set('site_url',  url('/'));
+
+        $siteUrl = url('/');
+
+        if (ends_with($siteUrl, '/index.php')) {
+            $siteUrl = substr($siteUrl, 0, -10);
+        }
+
+        Option::set('site_url',  $siteUrl);
 
         // register super admin
         $user = User::register(
@@ -137,7 +144,7 @@ class SetupController extends Controller
             Artisan::call('view:clear');
         } catch (\Exception $e) {
             Log::error('Error occured when processing view:clear', $e);
-            
+
             File::cleanDirectory(storage_path('framework/views'));
         }