Replace login with username for Repository methods