Preparation before introducing spring security (for now it at least
works...)