final fixes for Users