diff --git a/src/XrdClient/XrdClient.cc b/src/XrdClient/XrdClient.cc
index dc1ee845b79..a641cceff2c 100644
--- a/src/XrdClient/XrdClient.cc
+++ b/src/XrdClient/XrdClient.cc
@@ -1372,7 +1372,7 @@ bool XrdClient::OpenFileWhenRedirected(char *newfhandle, bool &wasopen)
 	Info(XrdClientDebug::kHIDEBUG,
 	     "OpenFileWhenRedirected", "Stripping off the 'delete' option." );
 
-	options &= !kXR_delete;
+	options &= ~kXR_delete;
 	options |= kXR_open_updt;
     }
 
@@ -1380,7 +1380,7 @@ bool XrdClient::OpenFileWhenRedirected(char *newfhandle, bool &wasopen)
 	Info(XrdClientDebug::kHIDEBUG,
 	     "OpenFileWhenRedirected", "Stripping off the 'new' option." );
 
-	options &= !kXR_new;
+	options &= ~kXR_new;
 	options |= kXR_open_updt;
     }
 
diff --git a/src/XrdSecpwd/XrdSecProtocolpwd.cc b/src/XrdSecpwd/XrdSecProtocolpwd.cc
index 3bb437beb43..d9616faa76e 100644
--- a/src/XrdSecpwd/XrdSecProtocolpwd.cc
+++ b/src/XrdSecpwd/XrdSecProtocolpwd.cc
@@ -1015,7 +1015,7 @@ if (hs->Step == kXPS_init)
          SessionSt.options = kOptsClntTty;
    }
 // case kXPS_puk:
-if (hs->Step == kXPS_puk)
+if ((hs->Step == kXPS_init) || (hs->Step == kXPS_puk))
    {
       // After auto-reg request, server puk have been saved in ParseClientInput:
       // we need to start a full normal login now
@@ -1045,8 +1045,6 @@ if (hs->Step == kXPS_puk)
       }
    }
 // case kXPS_signedrtag:     // (after kXRC_verifysrv)
-if (hs->Step == kXPS_signedrtag)
-   {
       //
       // Add the username
       if (hs->User.length()) {
@@ -1081,7 +1079,6 @@ if (hs->Step == kXPS_signedrtag)
          SessionSt.options |= kOptsChngPwd;
       //
       nextstep = kXPC_normal;
-   }
       break;
 
    case kXPS_credsreq: