diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index 648d8ff4b..0a9052413 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -2414,6 +2414,9 @@ krb5_init_creds_step(krb5_context context,
  
  		if (ctx->fast_state.flags & KRB5_FAST_DISABLED)
  		    goto out;
+		if (!(ctx->fast_state.flags & KRB5_FAST_EXPECTED)) {
+		    goto out;
+		}
  		if (ctx->fast_state.flags & (KRB5_FAST_REQUIRED | KRB5_FAST_EXPECTED))
  		    goto out;