diff --git a/web/app/models/HTML.php b/web/app/models/HTML.php
index 8c50e95..e1d7dd7 100644
--- a/web/app/models/HTML.php
+++ b/web/app/models/HTML.php
@@ -97,8 +97,10 @@ class HTML {
 		// }
 		if ($param) {
 			$url .= $path.'?'.HTML::query_string_encode($param);
-		} else if ($url != '/') {
+		} else if ($path != '/') {
 			$url .= rtrim($path, '/');
+		} else {
+			$url = $path;
 		}
 		return HTML::escape($url);
 	}
diff --git a/web/app/views/main-nav.php b/web/app/views/main-nav.php
index 65d8b68..c51f7fa 100644
--- a/web/app/views/main-nav.php
+++ b/web/app/views/main-nav.php
@@ -1,5 +1,5 @@
 <div class="navbar navbar-light navbar-expand-md bg-light mb-4" role="navigation">
-	<a class="navbar-brand" href="/"><?= UOJConfig::$data['profile']['oj-name-short'] ?></a>
+	<a class="navbar-brand" href="<?= HTML::url('/') ?>"><?= UOJConfig::$data['profile']['oj-name-short'] ?></a>
 	<button type="button" class="navbar-toggler collapsed" data-toggle="collapse" data-target=".navbar-collapse">
 		<span class="navbar-toggler-icon"></span>
 	</button>