diff --git a/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java b/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java
index 644d025..75b2d32 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/ansible/AnsibleDescribable.java
@@ -372,25 +372,25 @@ public static String[] getValues() {
     static final Property SSH_PASSWORD_STORAGE_PROP = PropertyBuilder.builder()
             .string(ANSIBLE_SSH_PASSWORD_STORAGE_PATH)
             .required(false)
-            .title("SSH Password Storage Path")
-            .description("Path to the ssh Password to use within Rundeck Storage.")
+            .title("Password Storage Path")
+            .description("Path to the Password to use within Rundeck Storage.")
             .renderingOption(StringRenderingConstants.SELECTION_ACCESSOR_KEY,
                     StringRenderingConstants.SelectionAccessor.STORAGE_PATH)
             .renderingOption(StringRenderingConstants.STORAGE_PATH_ROOT_KEY, "keys")
             .renderingOption(StringRenderingConstants.STORAGE_FILE_META_FILTER_KEY, "Rundeck-data-type=password")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
     static final Property SSH_PASSWORD_PROP = PropertyBuilder.builder()
             .string(ANSIBLE_SSH_PASSWORD)
             .required(false)
-            .title("SSH Password")
-            .description("Ansible SSH password.")
+            .title("User Password")
+            .description("Ansible User Password.")
             .renderingOption(StringRenderingConstants.DISPLAY_TYPE_KEY,
                     StringRenderingConstants.DisplayType.PASSWORD)
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
     static final Property SSH_AUTH_TYPE_PROP = PropertyBuilder.builder()
@@ -406,10 +406,10 @@ public static String[] getValues() {
     static final Property SSH_USER_PROP = PropertyBuilder.builder()
             .string(ANSIBLE_SSH_USER)
             .required(false)
-            .title("SSH User")
-            .description("SSH User to authenticate as (default=rundeck).")
+            .title("User")
+            .description("User to authenticate as (default=rundeck).")
             .renderingOption(StringRenderingConstants.GROUPING,"SECONDARY")
-            .renderingOption(StringRenderingConstants.GROUP_NAME,"SSH Connection")
+            .renderingOption(StringRenderingConstants.GROUP_NAME,"Authentication")
             .build();
 
     static final Property SSH_TIMEOUT_PROP = PropertyBuilder.builder()
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java
index 7c861a3..9a776a4 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleFileCopier.java
@@ -40,9 +40,9 @@ public class AnsibleFileCopier implements FileCopier, AnsibleDescribable, ProxyR
         builder.property(BINARIES_DIR_PATH_PROP);
         builder.property(INVENTORY_INLINE_PROP);
         builder.property(CONFIG_FILE_PATH);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_TIMEOUT_PROP);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java
index 11ed930..1332707 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleNodeExecutor.java
@@ -36,9 +36,9 @@ public class AnsibleNodeExecutor implements NodeExecutor, AnsibleDescribable, Pr
         builder.property(WINDOWS_EXECUTABLE_PROP);
         builder.property(CONFIG_FILE_PATH);
         builder.property(GENERATE_INVENTORY_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_TIMEOUT_PROP);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java
index 9ecb020..c5306b1 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowNodeStep.java
@@ -46,9 +46,9 @@ public class AnsiblePlaybookInlineWorkflowNodeStep implements NodeStepPlugin, An
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java
index 01c11c9..2257576 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookInlineWorkflowStep.java
@@ -47,9 +47,9 @@ public class AnsiblePlaybookInlineWorkflowStep implements StepPlugin, AnsibleDes
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java
index b21f864..0f0ec5f 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorflowNodeStep.java
@@ -45,9 +45,9 @@ public class AnsiblePlaybookWorflowNodeStep implements NodeStepPlugin, AnsibleDe
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java
index efba730..a6262f9 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsiblePlaybookWorkflowStep.java
@@ -46,9 +46,9 @@ public class AnsiblePlaybookWorkflowStep implements StepPlugin, AnsibleDescribab
         builder.property(VAULT_KEY_FILE_PROP);
         builder.property(VAULT_KEY_STORAGE_PROP);
         builder.property(EXTRA_ATTRS_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_STORAGE_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_KEY_STORAGE_PROP);
         builder.property(SSH_USE_AGENT);
diff --git a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java
index 0f94e79..0340227 100644
--- a/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java
+++ b/src/main/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceFactory.java
@@ -44,9 +44,9 @@ public AnsibleResourceModelSourceFactory(final Framework framework) {
         builder.property(IMPORT_INVENTORY_VARS_PROP);
         builder.property(IGNORE_INVENTORY_VARS_PROP);
         builder.property(EXTRA_ATTRS_PROP);
-        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_USER_PROP);
         builder.property(SSH_PASSWORD_PROP);
+        builder.property(SSH_AUTH_TYPE_PROP);
         builder.property(SSH_KEY_FILE_PROP);
         builder.property(SSH_TIMEOUT_PROP);
         builder.property(BECOME_PROP);