diff --git a/calendar/src/linoleum/calendar/Calendar.form b/calendar/src/linoleum/calendar/Calendar.form
index 124d4e4b..ee19d11d 100644
--- a/calendar/src/linoleum/calendar/Calendar.form
+++ b/calendar/src/linoleum/calendar/Calendar.form
@@ -40,7 +40,6 @@
     <Component class="com.toedter.calendar.JCalendar" name="jCalendar1">
       <Properties>
         <Property name="decorationBordersVisible" type="boolean" value="true"/>
-        <Property name="todayButtonVisible" type="boolean" value="true"/>
       </Properties>
     </Component>
   </SubComponents>
diff --git a/calendar/src/linoleum/calendar/Calendar.java b/calendar/src/linoleum/calendar/Calendar.java
index d75a2451..fc5df75b 100644
--- a/calendar/src/linoleum/calendar/Calendar.java
+++ b/calendar/src/linoleum/calendar/Calendar.java
@@ -1,5 +1,6 @@
 package linoleum.calendar;
 
+import java.util.Date;
 import javax.swing.ImageIcon;
 import linoleum.application.Frame;
 
@@ -11,6 +12,11 @@ public Calendar() {
 		setIcon(new ImageIcon(getClass().getResource("JCalendarColor24.png")));
 	}
 
+	@Override
+	public void open() {
+		jCalendar1.setDate(new Date());
+	}
+
 	@SuppressWarnings("unchecked")
         // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
         private void initComponents() {
@@ -23,7 +29,6 @@ private void initComponents() {
                 setFrameIcon(new javax.swing.ImageIcon(getClass().getResource("/com/toedter/calendar/images/JCalendarColor16.gif"))); // NOI18N
 
                 jCalendar1.setDecorationBordersVisible(true);
-                jCalendar1.setTodayButtonVisible(true);
 
                 javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
                 getContentPane().setLayout(layout);
@@ -39,7 +44,6 @@ private void initComponents() {
                 pack();
         }// </editor-fold>//GEN-END:initComponents
 
-
         // Variables declaration - do not modify//GEN-BEGIN:variables
         private com.toedter.calendar.JCalendar jCalendar1;
         // End of variables declaration//GEN-END:variables