Handle credentials even better