Added patch to use current user with South