diff --git a/images/favicon.ico b/images/favicon.ico
new file mode 100644
index 00000000..84b71747
Binary files /dev/null and b/images/favicon.ico differ
diff --git a/templates/Classic/header.tpl b/templates/Classic/header.tpl
index fd21b301..66e25dc4 100644
--- a/templates/Classic/header.tpl
+++ b/templates/Classic/header.tpl
@@ -9,6 +9,7 @@
+
<if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor
diff --git a/templates/Froxlor/header.tpl b/templates/Froxlor/header.tpl
index e6fde870..05f1eb7a 100644
--- a/templates/Froxlor/header.tpl
+++ b/templates/Froxlor/header.tpl
@@ -12,6 +12,7 @@
+
<if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel