diff --git a/src/main/scala/app/ControllerBase.scala b/src/main/scala/app/ControllerBase.scala
index b4c39ed..82ea872 100644
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -140,11 +140,9 @@
 case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
 
   lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
-
   lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
-
-  lazy val baseURL = request.getRequestURL.substring(0, request.getRequestURL.length - request.getRequestURI.length) + path
-  lazy val host = request.getServerName
+  lazy val baseURL = settings.baseUrl.getOrElse(request.getRequestURL.substring(0, request.getRequestURL.length - request.getRequestURI.length))
+  lazy val host = new java.net.URL(baseURL).getHost
 
   /**
    * Get object from cache.