diff --git a/algorithm.c b/algorithm.c
index bafb1dcb..cf09f60c 100644
--- a/algorithm.c
+++ b/algorithm.c
@@ -16,10 +16,12 @@ void set_algorithm(algorithm_t* algo, const char* newname) {
     strncpy(algo->name, newname, sizeof(algo->name));
     algo->name[sizeof(algo->name) - 1] = '\0';
 
-    if (strcmp(algo->name, "adaptive-nfactor") == 0) {
-	    set_algorithm_nfactor(algo, 11);
+    if ((strcmp(algo->name, "adaptive-n-factor") == 0) ||
+	(strcmp(algo->name, "adaptive-nfactor")  == 0) ||
+	(strcmp(algo->name, "nscrypt")           == 0) ) {
+	set_algorithm_nfactor(algo, 11);
     } else {
-	    set_algorithm_nfactor(algo, 10);
+	set_algorithm_nfactor(algo, 10);
     }
 
     return;