diff --git a/lib/Bastion/HPSS.py b/lib/Bastion/HPSS.py
index c8ab782..1f26a3b 100644
--- a/lib/Bastion/HPSS.py
+++ b/lib/Bastion/HPSS.py
@@ -6,6 +6,7 @@
 import json
 import socket
 import logging
+import getpass
 
 from Bastion.Common import Thing, Unknown
 import Bastion.Model
@@ -216,7 +217,7 @@ def __delitem__(self, path):
 class HSI:
 	def __init__(self, xpath = None, **kwargs):
 		self.xpath  = pathlib.Path( kwargs.get('xpath', "/usr/local/bin/hsi") )
-		self.login  = kwargs.get('login', os.getlogin())
+		self.login  = kwargs.get('login', getpass.getuser())
 		self.keytab = pathlib.Path(kwargs.get('keytab', '~/.private/hpss.unix.keytab')).expanduser()
 		self.procd  = None
 
@@ -323,7 +324,7 @@ class Vault(Bastion.Model.Vault):
 	def __init__(self, name, **kwargs):
 		self.name   = name
 		self.server = kwargs.get('server', socket.gethostname())
-		self.login  = kwargs.get('login', os.getlogin())
+		self.login  = kwargs.get('login', getpass.getuser())
 		self.keytab = pathlib.Path( kwargs.get('keytab', "~/.private/hpss.unix.keytab") ).expanduser()
 		self.root   = kwargs.get('root', None)
 		self.hpath  = pathlib.Path( kwargs.get('hpath', '/opt/hsi') )