diff --git a/src/painel/client/src/org/novosga/painel/client/Main.java b/src/painel/client/src/org/novosga/painel/client/Main.java
index aa6683c7b..2f424c667 100644
--- a/src/painel/client/src/org/novosga/painel/client/Main.java
+++ b/src/painel/client/src/org/novosga/painel/client/Main.java
@@ -80,12 +80,7 @@ public void start(Stage stage) throws Exception {
         }
         
         // Carrega a configuracao do painel
-        boolean configOk = false;
-        try {
-            config.load();
-            configOk = true;
-        } catch (Exception e) {
-        }
+        boolean configOk = config.load();
         
         FontLoader.registerAll();
         
@@ -136,6 +131,7 @@ public void run() {
             if (configOk) {
                 painel.show();
             } else {
+                controller.update();
                 controller.show();
             }
             try {
diff --git a/src/painel/client/src/org/novosga/painel/client/ui/Controller.java b/src/painel/client/src/org/novosga/painel/client/ui/Controller.java
index 272766cf6..a788ee2f2 100644
--- a/src/painel/client/src/org/novosga/painel/client/ui/Controller.java
+++ b/src/painel/client/src/org/novosga/painel/client/ui/Controller.java
@@ -134,7 +134,9 @@ public void update() {
         // servicos
         servidor.setText(config.get(PainelConfig.KEY_SERVER).getValue());
         unidadeAtual = config.get(PainelConfig.KEY_UNIDADE, Integer.class).getValue();
-        updateUnidades(main.getService().buscarUnidades());
+        if (unidadeAtual > 0) {
+            updateUnidades(main.getService().buscarUnidades());
+        }
         // som e tema
         vocalizar.setSelected(config.get(PainelConfig.KEY_SOUND_VOICE, Boolean.class).getValue());
         corFundo.setValue(Color.web(config.get(PainelConfig.KEY_COR_FUNDO).getValue()));
diff --git a/src/painel/client/src/org/novosga/painel/config/AppConfig.java b/src/painel/client/src/org/novosga/painel/config/AppConfig.java
index 9a2e2168b..1be43183b 100644
--- a/src/painel/client/src/org/novosga/painel/config/AppConfig.java
+++ b/src/painel/client/src/org/novosga/painel/config/AppConfig.java
@@ -22,10 +22,11 @@ public final File file() {
         return new File(dir(), filename());
     }
     
-    public final void load() throws FileNotFoundException, IOException {
+    public final boolean load() throws FileNotFoundException, IOException {
         Properties config = new Properties();
         File file = file();
-        if (!file.exists()) {
+        boolean exists = file.exists();
+        if (!exists) {
             file.createNewFile();
         }
         config.load(new FileInputStream(file));
@@ -33,6 +34,7 @@ public final void load() throws FileNotFoundException, IOException {
             String value = config.getProperty(param.getKey(), param.toString());
             param.setValue(parseValue(value, param.getType()));
         }
+        return exists;
     }
     
     public final void save() throws IOException {