Preparing for token use

To prepare for token/smartcard support in SafeGuard Enterprise: