Ensure that database.get_user_info() always returns two values, for simplicity
Merge pull request #114 from Rosuav/always_return_two

Ensure that database.get_user_info() always returns two values, for simplicity