diff --git a/jabber-browse.el b/jabber-browse.el
index 39572ac..78dc124 100644
--- a/jabber-browse.el
+++ b/jabber-browse.el
@@ -30,7 +30,7 @@
 (defun jabber-get-browse (jc to)
   "send a browse infoquery request to someone"
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "browse: ")))
+		     (jabber-read-jid-completing "browse: " nil nil nil nil t)))
   (jabber-send-iq jc to 
                   "get"
                   '(query ((xmlns . "jabber:iq:browse")))
diff --git a/jabber-disco.el b/jabber-disco.el
index c2c09cc..e2dfbc0 100644
--- a/jabber-disco.el
+++ b/jabber-disco.el
@@ -180,7 +180,7 @@ See JEP-0030."
 (defun jabber-get-disco-items (jc to &optional node)
   "Send a service discovery request for items"
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "Send items disco request to: ")
+		     (jabber-read-jid-completing "Send items disco request to: " nil nil nil 'full t)
 		     (jabber-read-node "Node (or leave empty): ")))
   (jabber-send-iq jc to
 		  "get"
@@ -195,7 +195,7 @@ See JEP-0030."
 (defun jabber-get-disco-info (jc to &optional node)
   "Send a service discovery request for info"
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "Send info disco request to: ")
+		     (jabber-read-jid-completing "Send info disco request to: " nil nil nil 'full t)
 		     (jabber-read-node "Node (or leave empty): ")))
   (jabber-send-iq jc to
 		  "get"
diff --git a/jabber-ft-client.el b/jabber-ft-client.el
index 20dbaa6..fa9da9a 100644
--- a/jabber-ft-client.el
+++ b/jabber-ft-client.el
@@ -28,7 +28,7 @@
 (defun jabber-ft-send (jc jid filename desc)
   "Attempt to send FILENAME to JID."
   (interactive (list (jabber-read-account)
-		     (jabber-read-jid-completing "Send file to: " nil nil nil 'full)
+		     (jabber-read-jid-completing "Send file to: " nil nil nil 'full t)
 		     (read-file-name "Send which file: " nil nil t)
 		     (jabber-read-with-input-method "Description (optional): ")))
   (if (zerop (length desc)) (setq desc nil))
diff --git a/jabber-time.el b/jabber-time.el
index bdeef5f..be01908 100644
--- a/jabber-time.el
+++ b/jabber-time.el
@@ -31,7 +31,7 @@
   "Request time"
   (interactive (list (jabber-read-account)
 		     (jabber-read-jid-completing "Request time of: "
-						 nil nil nil 'full)))
+						 nil nil nil 'full t)))
   (jabber-send-iq jc to
 		  "get"
 		  '(query ((xmlns . "jabber:iq:time")))
@@ -81,7 +81,7 @@
   "Request idle time of user."
   (interactive (list (jabber-read-account)
 		     (jabber-read-jid-completing "Get idle time for: " 
-						 nil nil nil 'full)))
+						 nil nil nil 'full t)))
   (jabber-send-iq jc to
 		  "get"
 		  '(query ((xmlns . "jabber:iq:last")))
diff --git a/jabber-util.el b/jabber-util.el
index 9a63912..f7ec2e1 100644
--- a/jabber-util.el
+++ b/jabber-util.el
@@ -225,7 +225,12 @@ If FULLJIDS is non-nil, complete jids with resources."
 			    (if (symbolp default)
 				(symbol-name default)
 			      default))
-		       (get-text-property (point) 'jabber-jid)
+                       (let* ((jid (get-text-property (point) 'jabber-jid))
+                              (res (get (jabber-jid-symbol jid) 'resource)))
+                         (when jid
+                           (if (and fulljids res (not (jabber-jid-resource jid)))
+                               (format "%s/%s" jid res)
+                             jid)))
 		       (bound-and-true-p jabber-chatting-with)
 		       (bound-and-true-p jabber-group)))
 	(completion-ignore-case t)
diff --git a/jabber-version.el b/jabber-version.el
index 20c494c..91d6ff3 100644
--- a/jabber-version.el
+++ b/jabber-version.el
@@ -34,7 +34,7 @@
   "Request software version"
   (interactive (list
 		(jabber-read-account)
-		(jabber-read-jid-completing "Request version of: " nil nil nil 'full)))
+		(jabber-read-jid-completing "Request version of: " nil nil nil 'full t)))
   (jabber-send-iq jc to
 		  "get"
 		  '(query ((xmlns . "jabber:iq:version")))