Adding fix to get user