diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
index 2f87130c..3717cc7b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/InstitutionalAuthenticationEntryPoint.java
@@ -78,7 +78,7 @@ final class InstitutionalAuthenticationEntryPoint implements AuthenticationEntry
                     throw new IllegalArgumentException("Image of type: " + defaultLogoFileName + " not supported");
                 }
 
-                final Resource resource = resourceLoader.getResource("file:" + defaultLogoFileName);
+                final Resource resource = resourceLoader.getResource(defaultLogoFileName);
                 final Reader reader = new InputStreamReader(
                         new Base64InputStream(resource.getInputStream(), true),
                         Charsets.UTF_8);
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index 3ae6af90..03ada474 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -57,8 +57,8 @@ sebserver.ssl.redirect.html.port=8080
 sebserver.test.property=This is the default/root configuration
 
 sebserver.version=0.5.2 beta
-sebserver.init.organisation.name=ETHZ
 sebserver.init.adminaccount.gen-on-init=true
+sebserver.init.organisation.name=ETHZ
 sebserver.init.adminaccount.username=super-admin
 
 ### data source configuration
@@ -126,4 +126,4 @@ sebserver.gui.date.displayformat=MM/dd/yyyy HH:mm
 sebserver.gui.date.displayformat.timezone=|ZZ
 sebserver.gui.seb.client.config.download.filename=SEBClientSettings.seb
 sebserver.gui.seb.exam.config.download.filename=SEBExamSettings.seb
-sebserver.gui.defaultLogo=static/images/wpgijwr.png
+sebserver.gui.defaultLogo=classpath:/static/images/sebserver-logo.png
diff --git a/src/main/resources/static/images/sebserver-logo.png b/src/main/resources/static/images/sebserver-logo.png
new file mode 100644
index 00000000..eb08ff74
Binary files /dev/null and b/src/main/resources/static/images/sebserver-logo.png differ