Project User Handling

Project handling update for user fix