fix use of user credentials logic