Merged updates. User and admin functionalities fixed