Fixed #44 -- Don't require re-login after setup

Thanks to Dmitry Molotkov for the report.
Small code readability improvements