Refactor
Enable Connect button when possible