diff --git a/app/assets/javascripts/pages/contacts-index.js b/app/assets/javascripts/pages/contacts-index.js
index d596b62b74e..2f4dd607145 100644
--- a/app/assets/javascripts/pages/contacts-index.js
+++ b/app/assets/javascripts/pages/contacts-index.js
@@ -3,7 +3,7 @@ Diaspora.Pages.ContactsIndex = function() {
 
   this.subscribe("page/ready", function(evt, document) {
     self.infiniteScroll = self.instantiate("InfiniteScroll");
-    $('.conversation_button').twipsy({position: 'bottom'});
+    $('.conversation_button').tooltip({placement: 'bottom'});
   });
 
 };
diff --git a/app/assets/javascripts/pages/invitations-edit.js b/app/assets/javascripts/pages/invitations-edit.js
index 8f8797294bd..b223147ec32 100644
--- a/app/assets/javascripts/pages/invitations-edit.js
+++ b/app/assets/javascripts/pages/invitations-edit.js
@@ -3,6 +3,6 @@ Diaspora.Pages.InvitationsEdit = function() {
 
   this.subscribe("page/ready", function(evt, body) {
     jQuery.ajaxSetup({'cache': true});
-    $('#user_username').twipsy({trigger: 'select', placement: 'right'});
+    $('#user_username').tooltip({trigger: 'focus', placement: 'right'});
   });
 };
diff --git a/app/assets/javascripts/pages/invitations-new.js b/app/assets/javascripts/pages/invitations-new.js
index 4507695f8ec..da7338e64b7 100644
--- a/app/assets/javascripts/pages/invitations-new.js
+++ b/app/assets/javascripts/pages/invitations-new.js
@@ -5,7 +5,7 @@ Diaspora.Pages.InvitationsNew = function() {
     var rtl = $('html').attr('dir') == 'rtl',
         position = rtl ? 'left' : 'right';
 
-    $('#new_user [title]').twipsy({trigger: 'focus', placement: position});
+    $('#new_user [title]').tooltip({trigger: 'focus', placement: position});
     $('#user_email').focus();
   });
 };