diff --git a/design/standard/templates/user/registrationfeedback.tpl b/design/standard/templates/user/registrationfeedback.tpl
index 24ff5762daa..add6165048f 100644
--- a/design/standard/templates/user/registrationfeedback.tpl
+++ b/design/standard/templates/user/registrationfeedback.tpl
@@ -7,4 +7,8 @@
 {'Email'|i18n('design/standard/user/register')}: {$user.email}
 
 {'Link to user information'|i18n('design/standard/user/register')}:
-http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{if ezini( 'UserSettings', 'VerifyUserType' )|compare( '' )}
+  http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{else}
+	http://{$hostname}{concat( 'content/versionview/', $object.id, '/', $object.current.version )|ezurl( no )}
+{/if}
diff --git a/design/standard/templates/user/registrationinfo.tpl b/design/standard/templates/user/registrationinfo.tpl
index f556e20650b..a8571544c57 100644
--- a/design/standard/templates/user/registrationinfo.tpl
+++ b/design/standard/templates/user/registrationinfo.tpl
@@ -20,7 +20,10 @@ http://{$hostname}{concat( 'user/activate/', $hash, '/', $object.main_node_id )|
 {/if}
 
 
+
+{if ezini( 'UserSettings', 'VerifyUserType' )|compare( '' )}
 {'Link to user information'|i18n('design/standard/user/register')}:
-http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+	http://{$hostname}{concat('content/view/full/',$object.main_node_id)|ezurl(no)}
+{/if}
 
 {/let}
diff --git a/kernel/content/attribute_edit.php b/kernel/content/attribute_edit.php
index 35ec1821c5e..4bd5415e6c2 100644
--- a/kernel/content/attribute_edit.php
+++ b/kernel/content/attribute_edit.php
@@ -449,7 +449,8 @@
 {
     $sectionID = $object->attribute( 'section_id' );
     $section = eZSection::fetch( $sectionID );
-    $res->setKeys( array( array( 'section', $object->attribute( 'section_id' ) ),
+    if ( $section )
+        $res->setKeys( array( array( 'section', $object->attribute( 'section_id' ) ),
                           array( 'section_identifier', $section->attribute( 'identifier' ) ) ) );
 }