diff --git a/src/gajim.py b/src/gajim.py
index 921b94b01..b484f4d7a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1778,12 +1778,8 @@ class Interface:
 				# Open the window
 				self.roster.open_event(account, fjid, event)
 		elif type_ == 'gmail':
-			if gajim.config.get_per('accounts', account, 'savepass'):
-				url = ('http://www.google.com/accounts/ServiceLoginAuth?service=mail&Email=%s&Passwd=%s&continue=https://mail.google.com/mail') %\
-				(urllib.quote(gajim.config.get_per('accounts', account, 'name')),
-				urllib.quote(gajim.config.get_per('accounts', account, 'password')))
-			else:
-				url = ('http://mail.google.com/')
+			url = 'http://mail.google.com/mail?account_id=%s' % urllib.quote(
+				gajim.config.get_per('accounts', account, 'name'))
 			helpers.launch_browser_mailer('url', url)
 		elif type_ == 'gc-invitation':
 			event = gajim.events.get_first_event(account, jid, type_)
diff --git a/src/roster_window.py b/src/roster_window.py
index 250ae15bc..97b029f42 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -1783,12 +1783,8 @@ class RosterWindow:
 				config.AccountModificationWindow(account)
 
 	def on_open_gmail_inbox(self, widget, account):
-		if gajim.config.get_per('accounts', account, 'savepass'):
-			url = ('http://www.google.com/accounts/ServiceLoginAuth?service=mail&Email=%s&Passwd=%s&continue=https://mail.google.com/mail') %\
-			(urllib.quote(gajim.config.get_per('accounts', account, 'name')),
-			urllib.quote(gajim.config.get_per('accounts', account, 'password')))
-		else:
-			url = ('http://mail.google.com/')
+		url = 'http://mail.google.com/mail?account_id=%s' % urllib.quote(
+			gajim.config.get_per('accounts', account, 'name'))
 		helpers.launch_browser_mailer('url', url)
 
 	def on_change_status_message_activate(self, widget, account):