diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
index 2383c260..dba5c94c 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
@@ -288,11 +288,11 @@ public class MindmapServiceImpl
         this.notificationService = notificationService;
     }
 
-    public void setAdminUser(String adminUser) {
+    public void setAdminUser(@NotNull String adminUser) {
         this.adminUser = adminUser;
     }
 
-    public String getAdminUser() {
+    @NotNull  public String getAdminUser() {
         return adminUser;
     }
 }
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
index 5c2a7594..fc8e0091 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
@@ -35,11 +35,10 @@
         <property name="mindmapManager" ref="mindmapManager"/>
         <property name="userService" ref="userService"/>
         <property name="notificationService" ref="notificationService"/>
-        <property name="adminUser" ref="${admin.user}/>
+        <property name="adminUser" value="${admin.user}"/>
     </bean>
 
-    <bean id="mindmapService"
-          class="org.springframework.aop.framework.ProxyFactoryBean">
+    <bean id="mindmapService" class="org.springframework.aop.framework.ProxyFactoryBean">
         <property name="proxyInterfaces" value="com.wisemapping.service.MindmapService"/>
         <property name="interceptorNames">
             <list>