diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 2394b7fbd..75034f0fb 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-12  Don Allingham  <don@gramps-project.org>
+	* src/EditPerson.py: display LDS temple correctly
+	* src/plugins/NavWebpage.py: print nickname
+
 2006-02-12  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 	* src/po/Makefile.am (.po.mo): Allow for parallel building.
 
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 7871d56d7..81b8c6c8e 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -657,8 +657,10 @@ class EditPerson:
 
     def lds_field(self,lds_ord,combo,date,place):
         build_combo(combo,_temple_names)
-        temple_code = const.lds_temple_to_abrev.get(lds_ord.get_temple(),"")
+
+        temple_code = lds_ord.get_temple()
         index = _temple_names.index(temple_code)
+        
         combo.set_active(index)
         if not lds_ord.is_empty():
             stat = lds_ord.get_status()
diff --git a/gramps2/src/NameDisplay.py b/gramps2/src/NameDisplay.py
index 74c1603b6..00c92ebaa 100644
--- a/gramps2/src/NameDisplay.py
+++ b/gramps2/src/NameDisplay.py
@@ -147,6 +147,24 @@ class NameDisplay:
         else:
             return self._fnln(name,'')
 
+    def display_with_nick(self,person):
+        """
+        Returns a text string representing the L{RelLib.Person} instance's
+        L{RelLib.Name} in a manner that should be used for normal displaying.
+
+        @param person: L{RelLib.Person} instance that contains the
+        L{RelLib.Name} that is to be displayed. The primary name is used for
+        the display.
+        @type person: L{RelLib.Person}
+        @returns: Returns the L{RelLib.Person} instance's name
+        @rtype: str
+        """
+        name = person.get_primary_name()
+        if name.display_as == RelLib.Name.LNFN:
+            return self._lnfn(name,person.get_nick_name())
+        else:
+            return self._fnln(name,person.get_nick_name())
+
     def display_name(self,name):
         """
         Returns a text string representing the L{RelLib.Name} instance
diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py
index e799be2ce..d50b00fb0 100644
--- a/gramps2/src/plugins/NavWebPage.py
+++ b/gramps2/src/plugins/NavWebPage.py
@@ -1664,6 +1664,14 @@ class IndividualPage(BasePage):
 
             of.write('</td>\n</tr>\n')
 
+        # Gender
+
+        nick = self.person.get_nick_name()
+        if nick:
+            of.write('<tr><td class="field">%s</td>\n' % _('Nickname'))
+            of.write('<td class="data">%s</td>\n' % nick)
+            of.write('</tr>\n')
+
         # Gender
         of.write('<tr><td class="field">%s</td>\n' % _('Gender'))
         gender = self.gender_map[self.person.gender]
@@ -2836,7 +2844,7 @@ def nameof(person,private):
     if person.private and private:
         return _("Private")
     else:
-        return _nd.display(person)
+        return _nd.display_with_nick(person)
 
 def name_nameof(name,private):
     if name.private and private: