diff --git a/issuer.c b/issuer.c
index eca81c5..7d4f07d 100644
--- a/issuer.c
+++ b/issuer.c
@@ -3,7 +3,6 @@
 typedef enum issuer_state {
     ON,
     JOINSTART,
-    JOINPROCEED,
     READY
 } issuerstate_e;
 
@@ -48,33 +47,12 @@ int process_issuer(char *buffer) {
     printf("> ISSUER: %s\n", buffer);
 
     if (0 == strncasecmp("OK", buffer, 2)) {
-        switch (issuer.state) {
-            case JOINPROCEED:
-                bzero(buffer, MAX_BUFSIZE);
-                issuer.state = READY;
-                ret = 1;
-                break;
-            default:
-                printf("nothing to confirm\n");
-                bzero(buffer, MAX_BUFSIZE);
-                strncpy(buffer, "ERR\n", 4);
-                break;
-        }
+        printf("nothing to confirm\n");
     } else if (0 == strncasecmp("ERR", buffer, 3)) {
-        switch (issuer.state) {
-            case JOINPROCEED:
-                printf("command failed at client\n");
-                issuer.state = READY;
-                break;
-            default:
-                issuer.state = READY;
-                printf("ignoring command\n");
-                break;
-        }
+        printf("ignoring command\n");
     } else if (0 == strncasecmp("ABORT", buffer, 5)) {
         switch (issuer.state) {
             case JOINSTART:
-            case JOINPROCEED:
                 printf("aborting join\n");
                 issuer.state = READY;
                 bzero(buffer, MAX_BUFSIZE);
@@ -90,7 +68,6 @@ int process_issuer(char *buffer) {
         switch (issuer.state) {
             case READY:
             case JOINSTART:
-            case JOINPROCEED:
                 printf("generate new issuer identity\n");
                 if (0 == issuer_setup(buffer)) {
                     issuer.state = READY;
@@ -124,7 +101,7 @@ int process_issuer(char *buffer) {
         switch (issuer.state) {
             case JOINSTART:
                 if(0 == issuer_joinproceed(buffer)) {
-                    issuer.state = JOINPROCEED;
+                    issuer.state = READY;
                 }
                 break;
             default:
@@ -136,7 +113,6 @@ int process_issuer(char *buffer) {
     } else if (0 == strncasecmp("PUBLISH", buffer, 7)) {
         switch (issuer.state) {
             case READY:
-            case JOINPROCEED:
             case JOINSTART:
                 issuer_publish(buffer);
                 break;
diff --git a/member.c b/member.c
index 6db23ea..daf51fc 100644
--- a/member.c
+++ b/member.c
@@ -143,9 +143,8 @@ int member_join(char *buffer) {
         case JOINPROCEED:
             if (0 == strncasecmp("JOINPROCEED", buffer, 11)) {
                 printf("ISSUER > MEMBER: %s\n", buffer);
-                member_joinfinish(buffer);
+		ret = member_joinfinish(buffer);
                 member.state = JOINED;
-                ret = 1;
             } else {
                 printf("member_getpublic: did not get credentials from issuer\n");
                 member.state = RCVPUBLIC;
@@ -155,7 +154,7 @@ int member_join(char *buffer) {
         default:
             ret = -1;
     }
-    if (0 <= ret) {
+    if (0 == ret) {
         printf("ISSUER < MEMBER: %s\n", buffer);
     }
     return ret;
@@ -257,7 +256,7 @@ int member_joinfinish(char *buffer) {
     if(0 != ecdaa_member_public_key_FP256BN_serialize_file(member_public_key_file, &member.mpk) || 
             0 != ecdaa_member_secret_key_FP256BN_serialize_file(member_secret_key_file, &member.msk) || 
             0 != ecdaa_credential_FP256BN_serialize_file(member_credential_file, &member.cred)) {
-        printf("issuer_setup: Error saving key-pair or credential to disk\n");
+        printf("issuer_joinfinish: Error saving key-pair or credential to disk\n");
         ret = -1;
     } else {
       ret = 1;