diff --git a/offlineimap/.offlineimaprc b/offlineimap/.offlineimaprc
index af2cc8d..cf252b2 100644
--- a/offlineimap/.offlineimaprc
+++ b/offlineimap/.offlineimaprc
@@ -52,8 +52,8 @@ nametrans    = lambda folder: re.sub('^inbox$', 'INBOX', re.sub('^drafts$', '[Gm
 
 [Repository aethon-remote]
 type             = Gmail
-remoteusereval   = getuser("imap.google.com-aethon")
-remotepasseval   = getpassword("imap.google.com-aethon")
+remoteuser       = "thomas@aethon.nl"
+remotepasseval   = getpassword("aethon")
 realdelete       = no
 cert_fingerprint = 89091347184d41768bfc0da9fad94bfe882dd358
 folderfilter     = lambda folder: folder in ['INBOX', '[Gmail]/Concepten', '[Gmail]/Verzonden berichten', '[Gmail]/Prullenbak']
@@ -106,8 +106,8 @@ nametrans    = lambda folder: re.sub('^inbox$', 'INBOX', re.sub('^drafts$', '[Gm
 
 [Repository arch-remote]
 type             = Gmail
-remoteusereval   = getuser("imap.google.com-arch")
-remotepasseval   = getpassword("imap.google.com-arch")
+remoteuser       = tom.willemsen@archlinux.us
+remotepasseval   = getpassword("arch")
 realdelete       = no
 cert_fingerprint = 89091347184d41768bfc0da9fad94bfe882dd358
 folderfilter     = lambda folder: folder in ['INBOX', '[Gmail]/Drafts', '[Gmail]/Sent Mail', '[Gmail]/Trash']
@@ -124,8 +124,8 @@ localfolders = ~/documents/mail/iactor
 [Repository iactor-remote]
 type           = IMAP
 remotehost     = mail.iactor.nl
-remoteusereval = getuser("mail.iactor.nl")
-remotepasseval = getpassword("mail.iactor.nl")
+remoteuser     = "tom@iactor.nl"
+remotepasseval = getpassword("iactor")
 
 [Account ryuslash.alwaysdata]
 localrepository  = ryuslash.alwaysdata-local