diff --git a/apiserver/admin.go b/apiserver/admin.go
index 27ab933..1ec2bb8 100644
--- a/apiserver/admin.go
+++ b/apiserver/admin.go
@@ -121,6 +121,9 @@ func (a *admin) doLogin(req params.LoginRequest, loginVersion int) (params.Login
 		if kind != names.MachineTagKind {
 			return fail, errors.Trace(err)
 		}
+		if errors.Cause(err) != common.ErrBadCreds {
+			return fail, err
+		}
 		entity, err = a.checkControllerMachineCreds(req)
 		if err != nil {
 			return fail, errors.Trace(err)
diff --git a/worker/apicaller/connect.go b/worker/apicaller/connect.go
index 7c21d17..f452a83 100644
--- a/worker/apicaller/connect.go
+++ b/worker/apicaller/connect.go
@@ -24,7 +24,7 @@ var (
 	//
 	// TODO(katco): 2016-08-09: lp:1611427
 	checkProvisionedStrategy = utils.AttemptStrategy{
-		Total: 1 * time.Minute,
+		Total: 10 * time.Minute,
 		Delay: 5 * time.Second,
 	}