Only encrypt key if password data exists
Fix delimiter determination
Shot-in-the dark attempt to fix #12614