diff --git a/bin/ssh-agent-start-or-restart b/bin/ssh-agent-start-or-restart
index 11d49cc..a960469 100755
--- a/bin/ssh-agent-start-or-restart
+++ b/bin/ssh-agent-start-or-restart
@@ -6,6 +6,9 @@
 echo SSH_AGENTS_DIR: $SSH_AGENTS_DIR >&2
 echo SSH_AGENT_SOCKETS_DIR: $SSH_AGENT_SOCKETS_DIR >&2
 echo SSH_IDENTITIES_DIR: $SSH_IDENTITIES_DIR >&2
+[ -z "${SSH_AGENTS_DIR-x}" ]                || mkdir -vp "$SSH_AGENTS_DIR"
+[ -z "${SSH_AGENT_SOCKETS_DIR-x}" ]         || mkdir -vp "$SSH_AGENT_SOCKETS_DIR"
+[ -z "${SSH_IDENTITIES_DIR-x}" ]            || mkdir -vp "$SSH_IDENTITIES_DIR"
 agent-start-or-restart () {
     
     local ssh_identity
diff --git a/myshell_load_defaults b/myshell_load_defaults
index 3ac7d77..12f61e1 100644
--- a/myshell_load_defaults
+++ b/myshell_load_defaults
@@ -145,5 +145,3 @@ EOF
 [ -z "${SSH_IDENTITIES_DEFAULT_DIR+x}" ]    && { SSH_IDENTITIES_DEFAULT_DIR="${HOME}/.ssh/identities"; export SSH_IDENTITIES_DEFAULT_DIR; }
 [ -z "${SSH_AGENTS_DEFAULT_DIR+x}" ]        && { SSH_AGENTS_DEFAULT_DIR="${HOME}/.ssh/agents"; export SSH_AGENTS_DEFAULT_DIR; }
 [ -z "${SSH_AGENT_SOCKETS_DEFAULT_DIR+x}" ] && { SSH_AGENT_SOCKETS_DEFAULT_DIR="${HOME}/.ssh/agents"; export SSH_AGENT_SOCKETS_DEFAULT_DIR; }
-[ -n "${SSH_AGENTS_DIR-x}" ]                && { echo $SSH_AGENTS_DIR; mkdir -p "$SSH_AGENTS_DIR"; }
-[ -n "${SSH_AGENT_SOCKETS_DIR-x}" ]         && mkdir -p "$SSH_AGENT_SOCKETS_DIR"