Fixes for account user and application user