diff --git a/sidebar-top.php b/sidebar-top.php
index acb26e6..55c0583 100644
--- a/sidebar-top.php
+++ b/sidebar-top.php
@@ -31,12 +31,13 @@ if ( !is_active_sidebar( 'top-widget' )
 <?php global $current_user;
         echo "<br>";
         if (!is_user_logged_in()) {
-           echo "<a class='mytoplink' href=".site_url('/login/').">".__('Login')."</a> / ";
+           echo "<a class='mytoplink' href=".wp_login_url( get_permalink() ).">".__('Login')."</a> / ";
            echo "<a class='mytoplink' href=".site_url('/register/').">".__('Register')."</a>&nbsp;&nbsp;";
         } else {
            get_currentuserinfo();
            $a = sprintf( __('Howdy, %1$s'), $current_user->display_name );
            echo "<a class='mytoplink' href=".site_url('/forums/users/').$current_user->display_name.">".$a." ".get_avatar( $current_user->ID, 20 )."</a>&nbsp;&nbsp;";
+           echo "/ <a class='mytoplink' href=".wp_logout_url( get_permalink() ).">".__('Logout')."</a>&nbsp";
         }
         if ( function_exists ('the_msls' ) ) { echo " "; the_msls(); }
  ?>