Fix #21 and error in getUser