diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java b/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
index fbdc4267294c8beb2ab27b806f7b44c3423a33d0..1af8bb4423bedb32b93656c2e29bc21a919d5a43 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_7_1_1.java
@@ -101,17 +101,16 @@ public class OLATUpgrade_7_1_1 extends OLATUpgrade {
 			if (uhd.isInstallationComplete()) return false;
 		}
 		
-		if(!(portfolioCourseNodeEnabled && epfModule.isEnabled())) return false;
-	
-		// get template maps with invalid references and fix them 
-		fixInvalidMapReferences(upgradeManager, uhd);
-
-		// remove invalid references on db
-		fixInvalidTemplateMaps(upgradeManager, uhd);
+		if((portfolioCourseNodeEnabled && epfModule.isEnabled())) {
+			// get template maps with invalid references and fix them 
+			fixInvalidMapReferences(upgradeManager, uhd);
+			// remove invalid references on db
+			fixInvalidTemplateMaps(upgradeManager, uhd);
+		}
 		
 		migrateSecurityGroups(upgradeManager, uhd);
 
-//		uhd.setInstallationComplete(true);
+		uhd.setInstallationComplete(true);
 		upgradeManager.setUpgradesHistory(uhd, VERSION);
 		log.audit("Finished OLATUpgrade_7_1_1 successfully!");
 		return true;