spring security fix, entity refactoring