Minor changes in the user-module