diff --git a/config.org b/config.org
index 6f71bb1..1eeeacd 100644
--- a/config.org
+++ b/config.org
@@ -116,7 +116,7 @@
  Don't add the font in the work environment, which I am logged in as POH
 
 #+BEGIN_SRC emacs-lisp
- (unless (string-equal user-login-name "POH")
+ (unless (string-equal my/whoami "work_remote")
    (set-face-attribute 'default nil :font "Hack-12")
  )
 #+END_SRC
@@ -838,7 +838,7 @@ sudo apt install pandoc
   - some way to refresh the notmuch db before I run notmuch?
 
 #+BEGIN_SRC emacs-lisp
-(unless (string-equal user-login-name "POH")
+(unless (string-equal my/whoami "work_remote")
   (use-package notmuch
     :defer t
     :ensure t
@@ -866,7 +866,7 @@ sudo apt install pandoc
   Activate the beancount mode. ATTENTION: This mode is made by myself.
 
 #+BEGIN_SRC emacs-lisp
-(unless (string-equal user-login-name "POH")
+(unless (string-equal my/whoami "work_remote")
   (load "/home/marc/.emacs.d/user-local/elisp/beancount-mode.el") ; somehow load-path in use-package doesn't work
   (use-package beancount
     :load-path "/home/marc/.emacs.d/elisp"
@@ -1419,7 +1419,7 @@ Anaconda test
    - pdf-tools
 
 #+BEGIN_SRC emacs-lisp
-(unless (string-equal user-login-name "POH")
+(unless (string-equal my/whoami "work_remote")
   (use-package pdf-tools
     :ensure t
     :defer t