diff --git a/lib/anacondatest.pm b/lib/anacondatest.pm
index aac3bd3d..280ca75b 100644
--- a/lib/anacondatest.pm
+++ b/lib/anacondatest.pm
@@ -110,7 +110,9 @@ sub select_disks {
     if (%iscsi) {
         assert_and_click "anaconda_install_destination_add_network_disk";
         foreach my $target (keys %iscsi) {
-            my $ip = $iscsi{$target};
+            my $ip = $iscsi{$target}->[0];
+            my $user = $iscsi{$target}->[1];
+            my $password = $iscsi{$target}->[2];
             assert_and_click "anaconda_install_destination_add_iscsi_target";
             wait_still_screen 2;
             type_safely $ip;
@@ -118,6 +120,14 @@ sub select_disks {
             type_safely $target;
             # start discovery - three tabs, enter
             type_safely "\t\t\t\n";
+            if ($user && $password) {
+                assert_and_click "anaconda_install_destination_target_auth_type";
+                assert_and_click "anaconda_install_destination_target_auth_type_chap";
+                send_key "tab";
+                type_safely $user;
+                send_key "tab";
+                type_safely $password;
+            }
             assert_and_click "anaconda_install_destination_target_login";
             assert_and_click "anaconda_install_destination_select_target";
         }
diff --git a/needles/anaconda/install_destination/target_auth_type-20161214.json b/needles/anaconda/install_destination/target_auth_type-20161214.json
new file mode 100644
index 00000000..bbd29e69
--- /dev/null
+++ b/needles/anaconda/install_destination/target_auth_type-20161214.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "anaconda_install_destination_target_auth_type"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 426,
+      "ypos": 313,
+      "width": 88,
+      "height": 17,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_destination/target_auth_type-20161214.png b/needles/anaconda/install_destination/target_auth_type-20161214.png
new file mode 100644
index 00000000..53a7a10b
Binary files /dev/null and b/needles/anaconda/install_destination/target_auth_type-20161214.png differ
diff --git a/needles/anaconda/install_destination/target_auth_type_chap-20161214.json b/needles/anaconda/install_destination/target_auth_type_chap-20161214.json
new file mode 100644
index 00000000..e39a72ff
--- /dev/null
+++ b/needles/anaconda/install_destination/target_auth_type_chap-20161214.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 425,
+      "ypos": 343,
+      "width": 83,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_install_destination_target_auth_type_chap"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_destination/target_auth_type_chap-20161214.png b/needles/anaconda/install_destination/target_auth_type_chap-20161214.png
new file mode 100644
index 00000000..1a7de668
Binary files /dev/null and b/needles/anaconda/install_destination/target_auth_type_chap-20161214.png differ
diff --git a/tests/_support_server.pm b/tests/_support_server.pm
index c510bfca..4a98f687 100644
--- a/tests/_support_server.pm
+++ b/tests/_support_server.pm
@@ -27,7 +27,7 @@ sub run {
     ## ISCSI
 
     # start up iscsi target
-    assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n    backing-store /dev/vdb\n</target>' > /etc/tgt/conf.d/openqa.conf";
+    assert_script_run "printf '<target iqn.2016-06.local.domain:support.target1>\n    backing-store /dev/vdb\n    incominguser test weakpassword\n</target>' > /etc/tgt/conf.d/openqa.conf";
     # open firewall port
     assert_script_run "firewall-cmd --add-service=iscsi-target";
     assert_script_run "systemctl restart tgtd.service";
diff --git a/tests/disk_custom_iscsi.pm b/tests/disk_custom_iscsi.pm
index 40e6a161..8bd4115f 100644
--- a/tests/disk_custom_iscsi.pm
+++ b/tests/disk_custom_iscsi.pm
@@ -6,7 +6,7 @@ sub run {
     my $self = shift;
     # iscsi config hash
     my %iscsi;
-    $iscsi{'iqn.2016-06.local.domain:support.target1'} = '10.0.2.110';
+    $iscsi{'iqn.2016-06.local.domain:support.target1'} = ['10.0.2.110', 'test', 'weakpassword'];
     # Anaconda hub
     # Go to INSTALLATION DESTINATION and ensure one regular disk
     # and the iscsi target are selected.