better /whoami handling