diff --git a/app/Config/App.php b/app/Config/App.php
index 04768f508..d968861b3 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -523,7 +523,7 @@ class App extends BaseConfig
 		parent::__construct();
 		$this->https_on = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
 		$this->baseURL = $this->https_on ? 'https' : 'http';
-		$this->baseURL .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost');
+		$this->baseURL .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') . '/';
 		$this->baseURL .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 	}
 }
diff --git a/app/Views/login.php b/app/Views/login.php
index 29df071f6..c2297c6af 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -34,7 +34,7 @@
 			<div class="container-login container-fluid d-flex flex-column flex-md-row bg-body shadow rounded m-3 p-4 p-md-0">
 				<div class="box-logo d-flex flex-column justify-content-center align-items-center border-end px-4 pb-3 p-md-4">
 					<?php if (config('OSPOS')->settings['company_logo']): ?>
-						<img class="logo w-100" src="<?= base_url('../writable/uploads/' . config('OSPOS')->settings['company_logo']) ?>" alt="<?= lang('Common.logo') . '&nbsp;' . config('OSPOS')->settings['company'] ?>">
+						<img class="logo w-100" src="<?= base_url('images/' . config('OSPOS')->settings['company_logo']) ?>" alt="<?= lang('Common.logo') . '&nbsp;' . config('OSPOS')->settings['company'] ?>">
 					<?php else: ?>
 						<svg class="logo text-primary" role="img" viewBox="0 0 308.57998 308.57997" xmlns="http://www.w3.org/2000/svg">
 							<title><?= lang('common_software_title') . '&nbsp;' . lang('common_logo') ?></title>