diff --git a/cypress/tests/data/10-ApplicationSetup/40-CreateUsers.cy.js b/cypress/tests/data/10-ApplicationSetup/40-CreateUsers.cy.js
index 2737c53caa..00e1706ef5 100644
--- a/cypress/tests/data/10-ApplicationSetup/40-CreateUsers.cy.js
+++ b/cypress/tests/data/10-ApplicationSetup/40-CreateUsers.cy.js
@@ -56,15 +56,9 @@ describe('Data suite tests', function() {
 			}
 		];
 		users.forEach(user => {
-			cy.createUser(user);
+			cy.createUserByInvitation(user);
 		});
 		cy.logout();
-		var user = users[0];
-		if (!('email' in user)) user.email = user.username + '@mailinator.com';
-		if (!('password' in user)) user.password = user.username + user.username;
 
-		cy.login(user.username);
-		cy.resetPassword(user.username, user.password);
-		cy.logout();
 	});
 })
diff --git a/lib/pkp b/lib/pkp
index 0e68ad4c99..5c6eaa0ea2 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 0e68ad4c99150ab32bf1b3eda587d89ff2de5fe6
+Subproject commit 5c6eaa0ea2764450c139062c8f3709466cee1a19
diff --git a/lib/ui-library b/lib/ui-library
index 068bf9a265..af30912622 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 068bf9a2657a60f88e679c341265238da22a49a5
+Subproject commit af3091262202c675fb70ab204e794d5214f4ecdd