Removing dependency on user credentials