diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index e1da5017..46aeb502 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -37,6 +37,9 @@ public class Main implements Connector
 	public static void main( String args[] )
 		throws Exception
 	{
+		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" );
+		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
+		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE );
 /*		Calendar cal = Calendar.getInstance();
 		cal.set( 2004, 06, 14 );
 		if( cal.before( Calendar.getInstance() ) )
@@ -70,7 +73,8 @@ public class Main implements Connector
 			).getImage() );*/
 //		window.show();
 		avisos = new AvisosPanel();
-		LoginWindow loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ "logo_combo.jpg",//"logo"+File.separator + "logo_w400.jpg", 
+		String logoFileName = ( String ) Singleton.getInstance( SingletonConstants.COMPANY_LOGO );
+		LoginWindow loginWindow = new LoginWindow( new Main(), /*"logo"+File.separator +*/ logoFileName,//"logo"+File.separator + "logo_w400.jpg", 
 				new String[] { "SIPRPSoft" }, 
 				new String[] { "Vers\u00E3o 2.", "(EVOLUTE 2004)" }, "",
 				"root", "UNIXLuvsU", avisos, false );
diff --git a/trunk/siprp/SingletonConstants.java b/trunk/siprp/SingletonConstants.java
index fbc14e5f..fc3ff3c8 100644
--- a/trunk/siprp/SingletonConstants.java
+++ b/trunk/siprp/SingletonConstants.java
@@ -13,7 +13,9 @@ package siprp;
 public class SingletonConstants
 {
 	public static final String PERSISTENCE_MANAGER = "PERSISTENCE_MANAGER";
-	
+	public static final String COMPANY_NAME = "company_name";
+	public static final String COMPANY_LOGO = "company_logo";
+	public static final String WEB_AWARE = "web_aware";
 	
 	/** Creates a new instance of SingletonConstants */
 	private SingletonConstants()
diff --git a/trunk/siprp/ficha/EmpresaPanel.java b/trunk/siprp/ficha/EmpresaPanel.java
index 03c89337..1f38e9c4 100644
--- a/trunk/siprp/ficha/EmpresaPanel.java
+++ b/trunk/siprp/ficha/EmpresaPanel.java
@@ -11,6 +11,7 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 
+import com.evolute.utils.*;
 import com.evolute.utils.data.*;
 import com.evolute.utils.dataui.*;
 import com.evolute.utils.metadb.*;
@@ -43,6 +44,7 @@ public class EmpresaPanel extends JPanel
 	private MetaObject estabelecimento;
 	private MetaObject empresa;
 	
+	
 	/** Creates a new instance of EmpresaPanel */
 	public EmpresaPanel()
 		throws Exception
@@ -78,7 +80,7 @@ public class EmpresaPanel extends JPanel
 		defaultServicoSaudeButton.addActionListener( new ActionListener(){
 			public void actionPerformed( ActionEvent e )
 			{
-				designacaoServicoSaudeText.setText( provider.SIPRP );
+				designacaoServicoSaudeText.setText( (String) Singleton.getInstance( SingletonConstants.COMPANY_NAME ) );
 			}
 		} );
 		
@@ -95,7 +97,7 @@ public class EmpresaPanel extends JPanel
 		defaultServicoHigieneButton.addActionListener( new ActionListener(){
 			public void actionPerformed( ActionEvent e )
 			{
-				designacaoText.setText( provider.SIPRP );
+				designacaoText.setText(  (String) Singleton.getInstance( SingletonConstants.COMPANY_NAME )  );
 			}
 		} );
 		
diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java
index ca479573..e8488f17 100644
--- a/trunk/siprp/ficha/ExamePanel.java
+++ b/trunk/siprp/ficha/ExamePanel.java
@@ -256,6 +256,7 @@ public class ExamePanel extends JPanel
 		components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_3, outrasFuncoesTexts[ 2 ] );
 		components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRA_FUNCAO_4, outrasFuncoesTexts[ 3 ] );
 		components.putComponent( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.OUTRAS_RECOMENDACOES, recomendacoesText );
+		components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO );
 		components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.TRABALHADOR_ID );
 		components.putDummy( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.MEDICO_ID );
 	}
@@ -372,6 +373,7 @@ public class ExamePanel extends JPanel
 			}
 			Hashtable hash = new Hashtable();
 			ComponentController.save( exameFields, hash, components );
+			hash.put( FichaDataProvider.T_EXAMES + "." + FichaDataProvider.INACTIVO, "n" );
 			Enumeration enum = hash.keys();
 			while( enum.hasMoreElements() )
 			{