diff --git a/internal/httpservers/webuiServer.go b/internal/httpservers/webuiServer.go
index f6a29850..b5f78ee7 100644
--- a/internal/httpservers/webuiServer.go
+++ b/internal/httpservers/webuiServer.go
@@ -23,12 +23,16 @@ type webUISettings struct {
 func findWebuiDir() string {
 	directoriesToSearch := []string{
 		"./webui",
+		"/usr/share/OliveTin/webui/",
 		"/var/www/olivetin/",
+		"/etc/OliveTin/webui/",
 	}
 
 	for _, dir := range directoriesToSearch {
 		if _, err := os.Stat(dir); !os.IsNotExist(err) {
-			log.Infof("Found the webui directory here: %v", dir)
+			log.WithFields(log.Fields{
+				"dir": dir,
+			}).Infof("Found the webui directory")
 
 			return dir
 		}
diff --git a/internal/httpservers/webuiServer_test.go b/internal/httpservers/webuiServer_test.go
index deba59d6..bc2acd9a 100644
--- a/internal/httpservers/webuiServer_test.go
+++ b/internal/httpservers/webuiServer_test.go
@@ -3,9 +3,12 @@ package httpservers
 import (
 	"github.com/stretchr/testify/assert"
 	"testing"
+	"os"
 )
 
 func TestGetWebuiDir(t *testing.T) {
+	os.Chdir("../../") // go test sets the cwd to "httpservers" by default
+
 	dir := findWebuiDir()
 
 	assert.Equal(t, "./webui", dir, "Finding the webui dir")