     win.setMenuBarVisibility(false)
     win.setTitle('Welcome to the Commit.Live')
 
-    webContents.on 'did-finish-load', -> win.show()
+    webContents.on 'did-finish-load', ->
+      loadedUrl = webContents.getURL()
+      if loadedUrl is "https://github.com/login/oauth/authorize"
+        showNotify("Authenticating...")
+        win.hide()
+        return
+      firstMatch = loadedUrl.startsWith('https://github.com/login?client_id=')
+      secondMatch = loadedUrl.startsWith('https://github.com/login/oauth/authorize?client_id=')
+      if firstMatch
+        hideNotify()
+        win.show()
+      webContents.findInPage('Authorize') if secondMatch
+
+    webContents.on 'found-in-page', (event, result) ->
+      if result.matches
+        hideNotify()
+        webContents.stopFindInPage('clearSelection')
+        win.focus()
+        win.show()
 
     webContents.on 'close', ->
+      atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live-welcome:enable-login-btn')
+      hideNotify()
       webContents = null
       win = null
 

    else
      return false

commitLiveSignIn = () ->
  new Promise (resolve, reject) ->
    win = new BrowserWindow(
      autoHideMenuBar: true, 

localStorage = require './local-storage'
{commitLive, commitLiveApi} = require './config'
{BrowserWindow} = require 'remote'
{Notification} = require 'atom'

confirmOauthToken = (token,userId) ->
  headers = new Headers(
