Index: /branches/release-39/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-39/lib/MT/Template/ContextHandlers.pm (revision 2530)
+++ /branches/release-39/lib/MT/Template/ContextHandlers.pm (revision 2535)
@@ -12638,5 +12638,5 @@
 
 sub _load_sibling_categories {
-    my ($ctx, $cat) = @_;
+    my ($ctx, $cat, $class_type) = @_;
     my $blog_id = $cat->blog_id;
     my $r = MT::Request->instance;
@@ -12644,5 +12644,6 @@
     return $cats if $cats;
 
-    my @cats = MT::Category->load({blog_id => $blog_id, parent => $cat->parent},
+    my $class = MT->model($class_type);
+    my @cats = $class->load({blog_id => $blog_id, parent => $cat->parent},
                                   {'sort' => 'label', direction => 'ascend'});
     $r->stash('__cat_cache_'.$blog_id.'_'.$cat->parent, \@cats);
@@ -12683,5 +12684,5 @@
         (($uncompiled =~ /<MT:?Pages/i) ? 1 : 0);
     my $blog_id = $cat->blog_id;
-    my $cats = _load_sibling_categories($ctx, $cat);
+    my $cats = _load_sibling_categories($ctx, $cat, $class_type);
     my ($pos, $idx);
     $idx = 0;
Index: /branches/release-39/lib/MT/App/Comments.pm
===================================================================
--- /branches/release-39/lib/MT/App/Comments.pm (revision 2463)
+++ /branches/release-39/lib/MT/App/Comments.pm (revision 2535)
@@ -219,5 +219,5 @@
             }
         );
-        return $app->login( error => $app->translate('Invalid login.') );
+        return $app->login_form( error => $app->translate('Invalid login.') );
     }
 
@@ -237,5 +237,5 @@
                 $commenter =
                   $app->_create_commenter_assign_role( $q->param('blog_id') );
-                return $app->login( error => $app->translate('Invalid login') )
+                return $app->login_form( error => $app->translate('Invalid login') )
                   unless $commenter;
             }
@@ -243,5 +243,5 @@
                 my $registration = $app->config->CommenterRegistration;
                 unless ( $registration && $registration->{Allow} && $blog->allow_commenter_regist ) {
-                    return $app->login( error => $app->translate('Successfully authenticated but signing up is not allowed.  Please contact system administrator.') )
+                    return $app->login_form( error => $app->translate('Successfully authenticated but signing up is not allowed.  Please contact system administrator.') )
                       unless $commenter;
                 }
@@ -286,5 +286,5 @@
     $ctx->{app} ||= $app;
     MT::Auth->invalidate_credentials($ctx);
-    return $app->login( error => $error || $app->translate("Invalid login") );
+    return $app->login_form( error => $error || $app->translate("Invalid login") );
 }
 
@@ -335,5 +335,5 @@
         sub {
             $app->_send_signup_confirmation( $user->id, $user->email,
-                $param->{entry_id}, $param->{blog_id}, $param->{static} );
+                $param->{entry_id}, $param->{blog_id}, $param->{static} || $param->{return_url} );
         }
     );
@@ -532,5 +532,5 @@
     }
 
-    $app->login(
+    $app->login_form(
         message => $app->translate(
             'Thanks for the confirmation.  Please sign in to comment.')