Associating current_user

following Raghu’s changes