Fix return value in case user was not found
Make the client a bit more dynamic