Only creating data directory if a public key is used, reverting home directory logic