diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
index a02fc5e019e..161c2b915b3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java
@@ -201,11 +201,17 @@ private void savePerformed(AjaxRequestTarget target) {
         ObjectWrapper wrapper = accountModel.getObject();
         try {
             ObjectDelta<ShadowType> delta = wrapper.getObjectDelta();
+            if (delta == null) {
+                return;
+            }
+            if (delta.getPrismContext() == null) {
+                getPrismContext().adopt(delta);
+            }
             if (LOGGER.isTraceEnabled()) {
                 LOGGER.trace("Account delta computed from form:\n{}", new Object[]{delta.debugDump(3)});
             }
 
-            if (delta == null || delta.isEmpty()) {
+            if (delta.isEmpty()) {
                 return;
             }
             WebMiscUtil.encryptCredentials(delta, true, getMidpointApplication());