Merge with User Login/ Admin Assign part