Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7702)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7703)
@@ -35,5 +35,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...Welcome to the...
+  ...Welcome to...
   ...
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7702)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7703)
@@ -285,8 +285,5 @@
     grok.context(IUniversity)
     pnav = 0
-
-    @property
-    def label(self):
-        return self.context['configuration'].title
+    label = ''
 
     @property
@@ -294,5 +291,12 @@
         portal_language = getUtility(ISIRPUtils).PORTAL_LANGUAGE
         lang = self.request.cookies.get('sirp.language', portal_language)
-        return self.context['configuration'].frontpage_dict.get(lang,'')
+        html = self.context['configuration'].frontpage_dict.get(lang,'')
+        if html =='':
+            html = self.context[
+                'configuration'].frontpage_dict.get(portal_language,'')
+        if html =='':
+            return _(u'<h1>Welcome to WAeUP.SIRP</h1>')
+        else:
+            return html
 
 class AdministrationPage(SIRPPage):
Index: /main/waeup.sirp/trunk/src/waeup/sirp/frontpage.rst
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/frontpage.rst	(revision 7702)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/frontpage.rst	(revision 7703)
@@ -1,2 +1,5 @@
+Welcome to the Student Information and Registration Portal
+==========================================================
+
 This is the default frontpage of the portal written
 in `reStructuredText (reST)
@@ -32,4 +35,7 @@
 
 >>de<<
+Willkommen im Studenteninformations- und Registrierungsportal
+=============================================================
+
 Dies ist die Standard-Startseite des Portals. Sie wurde in der Markup-Sprache
 `reStructuredText (reST) <http://docutils.sourceforge.net/docs/user/rst/quickref.html>`_
Index: /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7702)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7703)
@@ -398,11 +398,4 @@
         )
 
-    title = schema.TextLine(
-        title = u'Title of Frontpage',
-        default = u'Welcome to the Student Information and Registration ' +
-                  u'Portal of Sample University',
-        required = False,
-        )
-
     skin = schema.Choice(
         title = u'Skin',
Index: /main/waeup.sirp/trunk/src/waeup/sirp/widgets/restwidget.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/widgets/restwidget.py	(revision 7702)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/widgets/restwidget.py	(revision 7703)
@@ -43,5 +43,5 @@
             value = self.context.default
         if value == self.context.missing_value:
-            return ""
+            return {}
         parts = value.split('>>')
         elements = {}
