diff --git a/weed/admin/dash/admin_server.go b/weed/admin/dash/admin_server.go
index 061d8e918..4ce357502 100644
--- a/weed/admin/dash/admin_server.go
+++ b/weed/admin/dash/admin_server.go
@@ -98,36 +98,30 @@ func NewAdminServer(masters string, templateFS http.FileSystem, dataDir string)
 		glog.Warningf("Failed to initialize credential manager: %v", err)
 		// Continue without credential manager - will fall back to legacy approach
 	} else {
+		server.credentialManager = credentialManager
+
 		// For stores that need filer address function, set them
 		if store := credentialManager.GetStore(); store != nil {
 			if filerFuncSetter, ok := store.(interface {
 				SetFilerAddressFunc(func() pb.ServerAddress, grpc.DialOption)
 			}); ok {
-			// We'll set the filer address function later when we discover filers
-			// For now, just store the credential manager
-			server.credentialManager = credentialManager
-
-			// Set up a goroutine to configure filer address function once we discover filers
-			go func() {
-				for {
-					filerAddr := server.GetFilerAddress()
-					if filerAddr != "" {
-						// Configure the function to dynamically return the current active filer (HA-aware)
-						filerFuncSetter.SetFilerAddressFunc(func() pb.ServerAddress {
-							return pb.ServerAddress(server.GetFilerAddress())
-						}, server.grpcDialOption)
-						glog.V(1).Infof("Set filer address function for credential manager: %s", filerAddr)
-						break
+				// Set up a goroutine to configure filer address function once we discover filers
+				go func() {
+					for {
+						filerAddr := server.GetFilerAddress()
+						if filerAddr != "" {
+							// Configure the function to dynamically return the current active filer (HA-aware)
+							filerFuncSetter.SetFilerAddressFunc(func() pb.ServerAddress {
+								return pb.ServerAddress(server.GetFilerAddress())
+							}, server.grpcDialOption)
+							glog.V(1).Infof("Set filer address function for credential manager: %s", filerAddr)
+							break
+						}
+						glog.V(1).Infof("Waiting for filer discovery for credential manager...")
+						time.Sleep(5 * time.Second)
 					}
-					glog.V(1).Infof("Waiting for filer discovery for credential manager...")
-					time.Sleep(5 * time.Second)
-				}
-			}()
-			} else {
-				server.credentialManager = credentialManager
+				}()
 			}
-		} else {
-			server.credentialManager = credentialManager
 		}
 	}
 
diff --git a/weed/command/admin.go b/weed/command/admin.go
index ded85a2ee..c8a4a4b12 100644
--- a/weed/command/admin.go
+++ b/weed/command/admin.go
@@ -22,6 +22,7 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/admin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/handlers"
+	_ "github.com/seaweedfs/seaweedfs/weed/credential/filer_etc" // Register filer_etc credential store
 	"github.com/seaweedfs/seaweedfs/weed/pb"
 	"github.com/seaweedfs/seaweedfs/weed/security"
 	"github.com/seaweedfs/seaweedfs/weed/util"