Bug fixes with actual user logged in