#27 merging user with Spring Security