Added dropdown and auto user retrieving