WH-42 - fixing the user settings module