diff --git a/t/selenium/controller_subscriber.t b/t/selenium/controller_subscriber.t
index ff2b3a86db..b9a715f3e6 100644
--- a/t/selenium/controller_subscriber.t
+++ b/t/selenium/controller_subscriber.t
@@ -68,9 +68,10 @@ $d->find_element('//*[@id="e164.sn"]')->send_keys(int(rand(99999999)));
 $d->find_element('//*[@id="email"]')->send_keys($emailstring);
 $d->find_element('//*[@id="webusername"]')->send_keys($username);
 $d->find_element('//*[@id="webpassword"]')->send_keys('testing1234'); #workaround for misclicking on ok button
-$d->find_element('//*[@id="gen_password"]')->click();
+$d->find_element('//*[@id="webpassword"]/../div[@id="gen_password"]')->click();
 $d->find_element('//*[@id="username"]')->send_keys($username);
-$d->find_element('//*[@id="password"]')->send_keys('testing1234'); #using normal pwd, cannot easily separate both generate buttons
+$d->find_element('//*[@id="password"]')->send_keys('testing1234'); #workaround for misclicking on ok button
+$d->find_element('//*[@id="password"]/../div[@id="gen_password"]')->click();
 $d->find_element('//*[@id="save"]')->click();
 
 diag("Search Subscriber");