Environmentusers functionality
Merge fixed