Bug fixes for Users and error check for task completion