diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 14e1e708cd..5d78464ef4 100644
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -100,6 +100,7 @@ private:
     void Init()
     {
         m_imageData = NULL;
+        m_authNeeded = false;
     }
 
     // Switches button into owner-drawn mode: this is used if we need to draw
diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index e08d58e3be..4eea5a4c5a 100644
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -450,8 +450,6 @@ bool wxButton::Create(wxWindow *parent,
                       const wxValidator& validator,
                       const wxString& name)
 {
-    m_authNeeded = false;
-
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
     {