diff --git a/lib/stats.go b/lib/stats.go
index 709f9a2..b12bb86 100644
--- a/lib/stats.go
+++ b/lib/stats.go
@@ -24,7 +24,6 @@ type handler struct {
 	db       database.DB
 	store    storage.Store
 	template *Template
-	hostname string
 	ro       bool
 	t1       time.Time
 }
@@ -79,12 +78,11 @@ type StatsGatherer struct {
 	store      storage.Store
 	template   *Template
 	instrument instrument.Instrument
-	hostname   string
 	channel    chan statsRequest
 	ro         bool
 }
 
-func InitStats(database database.DB, store storage.Store, hostname string, template *Template, ro bool) *StatsGatherer {
+func InitStats(database database.DB, store storage.Store, template *Template, ro bool) *StatsGatherer {
 	in := instrument.Init()
 
 	sg := StatsGatherer{
@@ -93,7 +91,6 @@ func InitStats(database database.DB, store storage.Store, hostname string, templ
 		store:      store,
 		instrument: in,
 		template:   template,
-		hostname:   hostname,
 		ro:         ro,
 	}
 
@@ -109,7 +106,6 @@ func (sg StatsGatherer) Gather(function func(handler)) func(http.ResponseWriter,
 			store:    sg.store,
 			db:       sg.db,
 			template: sg.template,
-			hostname: sg.hostname,
 			w:        w,
 			r:        r,
 			sess:     GetSession(r, sg.db),
diff --git a/lib/template.go b/lib/template.go
index f3dc6ff..a36084b 100644
--- a/lib/template.go
+++ b/lib/template.go
@@ -36,7 +36,11 @@ type Status struct {
 
 func GetStatus(h handler) Status {
 	var s Status
-	s.BaseURL = "http://" + h.hostname
+	host := h.r.Host
+	s.BaseURL = "https://" + host
+	if strings.HasSuffix(host, ".onion") || strings.Contains(host, "localhost") {
+		s.BaseURL = "http://" + host
+	}
 	s.FullURL = s.BaseURL + h.r.RequestURI
 	s.Title = "Imperial Library of Trantor"
 	s.User = h.sess.User
diff --git a/main.go b/main.go
index 37b1587..b1339e8 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"os"
 
-	"gitlab.com/trantor/trantor/lib"
+	trantor "gitlab.com/trantor/trantor/lib"
 	"gitlab.com/trantor/trantor/lib/database"
 	"gitlab.com/trantor/trantor/lib/storage"
 )
@@ -21,7 +21,6 @@ func main() {
 		dbName       = flag.String("db-name", "trantor", "Name of the database")
 		storePath    = flag.String("store", "store", "Path of the books storage")
 		assetsPath   = flag.String("assets", ".", "Path of the assets (templates, css, js, img)")
-		hostname     = flag.String("hostname", "xfmro77i3lixucja.onion", "Hostname of the website")
 		loggerConfig = flag.String("logger-conf", "logger.xml", "xml configuration of the logger")
 		setAdminUser = flag.String("set-admin-user", "", "create/update this user to be admin if set-admin-pass is also specified")
 		setAdminPass = flag.String("set-admin-pass", "", "create/update admin user password if set-admin-user is also specified")
@@ -65,7 +64,7 @@ func main() {
 	}
 
 	template := trantor.InitTemplate(*assetsPath)
-	sg := trantor.InitStats(db, store, *hostname, template, *ro)
+	sg := trantor.InitStats(db, store, template, *ro)
 	trantor.InitUpload(db, store)
 	trantor.InitTasks(db, *loggerConfig)