diff --git a/README.md b/README.md
index 0560de4..9f19493 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ __Optional ~/.vimrc Variables:__
 * let g:vimchat\_buddylistmaxwidth = max width of buddy list window, default ''
 * let g:vimchat\_timestampformat = format of the message timestamp, default "[%H:%M]" 
 * let g:vimchat\_showPresenceNotification = notification if buddy changed status, comma-separated list of states, default ""
+* let g:vimchat\_statusAutoCompletion = (0 or 1), default is 1
 
 # Hacking
 
@@ -88,7 +89,6 @@ __Optional ~/.vimrc Variables:__
 * All python code should follow pep8 guidelines
 * All new features should update documentation in the README
 
-
 # Contributors 
 
 * Philipp [philsmd](https://github.com/philsmd)
diff --git a/plugin/vimchat.vim b/plugin/vimchat.vim
index 4ab3c36..4133f59 100644
--- a/plugin/vimchat.vim
+++ b/plugin/vimchat.vim
@@ -30,6 +30,7 @@
 "   g:vimchat_timestampformat = format of the msg timestamp default "[%H:%M]" 
 "   g:vimchat_showPresenceNotification =
 "       notify if buddy changed status default ""
+"   g:vimchat_statusAutoCompletion = (0 or 1) default is 1
 
 python <<EOF
 try:
@@ -1458,9 +1459,23 @@ class VimChatScope:
         vim.command('normal G')
 
     def setStatus(self, status=None):
+        if not self.accounts:
+            print "Not Connected!  Please connect first."
+            return 0
         if not status:
+            statusCompletion = ''
+            if int(vim.eval("g:vimchat_statusAutoCompletion"))==1:
+                firstAccount = self.accounts.itervalues().next()
+                if firstAccount != None:
+                    [oldShow,oldStatus] = firstAccount.jabberGetPresence()
+                
+                if oldShow != None and str(oldShow) != "None":
+                    statusCompletion = str(oldShow)
+                if oldStatus != None and str(oldStatus) != "None":
+                    statusCompletion += ','+str(oldStatus)
             status = str(vim.eval(
-                'input("Status: (away,xa,dnd,chat),message,priority: ")'))
+                'input("Status: (away,xa,dnd,chat),message,priority: ",'+
+                    '"'+statusCompletion+'")'))
 
         parts = status.split(',')
         show = parts[0]
@@ -1727,6 +1742,9 @@ fu! VimChatCheckVars()
     if !exists('g:vimchat_showPresenceNotification')
         let g:vimchat_showPresenceNotification=""
     endif
+    if !exists('g:vimchat_statusAutoCompletion')
+        let g:vimchat_statusAutoCompletion=1
+    endif
 
     return 1
 endfu