diff --git a/lib/uffizzi/cli/login.rb b/lib/uffizzi/cli/login.rb
index d3438716..da12e229 100644
--- a/lib/uffizzi/cli/login.rb
+++ b/lib/uffizzi/cli/login.rb
@@ -20,6 +20,7 @@ def initialize(options)
     end
 
     def run
+      logout
       return perform_email_login if @options[:email]
 
       perform_browser_login
@@ -27,6 +28,15 @@ def run
 
     private
 
+    def logout
+      return unless Uffizzi::AuthHelper.signed_in?
+
+      server = ConfigFile.read_option(:server)
+      destroy_session(server)
+
+      AuthHelper.sign_out
+    end
+
     def perform_email_login
       Uffizzi.ui.say('Login to Uffizzi server.')
       username =  Uffizzi::LoginHelper.set_username(@options)