diff --git a/fbconnect.module b/fbconnect.module
index 82ad43e..48a3548 100644
--- a/fbconnect.module
+++ b/fbconnect.module
@@ -92,6 +92,10 @@ function fbconnect_block_info() {
  * Implements hook_block_view().
  */
 function fbconnect_block_view($delta = '') {
+  global $user;
+  if ($user->uid) {
+    return;
+  }
   $block = array();
 
   switch ($delta) {
@@ -300,8 +304,7 @@ function fbconnect_user_edit_submit($form, &$form_state) {
 /**
  * Render a custom button to log in via Facebook.
  */
-function fbconnect_render_button($attr = array(), $op = null) {
-
+function fbconnect_render_button($attr = array(), $op = NULL) {
   $user_profile = fbconnect_user_profile();
   if (!$op) {
     $op = $user_profile ? 'login' : 'register';
@@ -546,7 +549,6 @@ function fbconnect_page_alter(&$page) {
         }());
       </script>'
     );
-
   }
 }
 
@@ -591,7 +593,7 @@ function fbconnect_autoconnect_form_submit($form, &$form_state) {
       $form_state['values']['uid'] = $uid;
     }
     $form_state['values']['fbuid'] = $fbuid;
-
+    
     if (!$uid) {
       if (variable_get('fbconnect_reg_options', 0) == 1) {
         if ($uid_from_email = _email_allready_exist($data['email'])) {
@@ -989,8 +991,7 @@ function theme_fbconnect_login_button($variables) {
     $url = url('fbconnect/register/create');
     $title = t('Hello %name', array('%name' => $user_profile['name']));
     $desc = t('Login to this site using your Facebook credentials.');
-    $link = '<a href="/fbconnect/register/create" class="fb_button fb_button_' . $attr['size'] . '"><span class="fb_button_text">' . $text . '</span></a>';
-    $button = '<button onclick="location.href=\'' . $url . '\'" id="fblogin" type="button">Log in</button>';
+    $link = '<a href="' . $url . '" class="fb_button fb_button_' . $attr['size'] . '"><span class="fb_button_text">' . $text . '</span></a>';
     return '<h3>' . $title . '</h3>' . $desc . $link;
   }
   else {