Switched from the manual implemented authentication-layer to Spring Security