diff --git a/sshp b/sshp
index e9f3876..662bbf0 100755
--- a/sshp
+++ b/sshp
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 OPENSSL_ENC_FLAGS=("-des3" "-base64" "-pbkdf2")
+SSH_META_DIR="$HOME/.ssh/meta"
 
 show_help() {
     cat <<EOF
@@ -40,7 +41,7 @@ add_creds() {
     pass="$3"
     ident_filepath="$4"
 
-    meta_filepath="$HOME/.ssh/meta/$creds_name"
+    meta_filepath="$SSH_META_DIR/$creds_name"
 
     if [[ -f "$meta_filepath" ]]; then
         echo "Credentials $creds_name is already exist" >&2
@@ -69,7 +70,7 @@ remove_creds() {
 
     creds_name="$1"
 
-    meta_filepath="$HOME/.ssh/meta/$creds_name"
+    meta_filepath="$SSH_META_DIR/$creds_name"
 
     if [[ ! -f "$meta_filepath" ]]; then
         echo "Credentials $creds_name is not exist" >&2
@@ -81,7 +82,7 @@ remove_creds() {
 }
 
 list_creds() {
-    for meta_filepath in $HOME/.ssh/meta/*; do
+    for meta_filepath in $SSH_META_DIR/*; do
         [[ -f "$meta_filepath" ]] || continue
 
         creds_name=$(basename "$meta_filepath")
@@ -94,7 +95,7 @@ list_creds() {
 get_pass() {
     creds_name="$1"
 
-    meta_filepath="$HOME/.ssh/meta/$creds_name"
+    meta_filepath="$SSH_META_DIR/$creds_name"
 
     if [[ ! -f "$meta_filepath" ]]; then
         echo "Credentials $creds_name is not exist" >&2
@@ -131,7 +132,7 @@ connect() {
 
     creds_name="$1"
 
-    meta_filepath="$HOME/.ssh/meta/$creds_name"
+    meta_filepath="$SSH_META_DIR/$creds_name"
 
     if [[ -z "$creds_name" || ! -f "$meta_filepath" ]]; then
         ssh "$@"
@@ -173,8 +174,8 @@ connect() {
         echo -n "$pass" | xclip -selection clipboard
     fi
 
-    # If ident file is provided connect without sshpass to catch key passphrase if needed
-    if [[ -n "$ident_filepath" ]]; then
+    # Check if authentication should be via pubkey
+    if ssh -v -o BatchMode=yes "${ssh_params[@]}" "$dest" 2>&1 | grep -q "Server accepts key"; then
         ssh "${ssh_params[@]}" "$dest"
     else
         sshpass -p "$pass" ssh "${ssh_params[@]}" "$dest"