diff --git a/following.html b/following.html
index 5c914d4..df6a66e 100644
--- a/following.html
+++ b/following.html
@@ -412,7 +412,7 @@
                         <li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
                     </ul>
                 </div>
-                <button class="followButton follow" href="#">Follow</button>
+                <button class="dinamicFollowButton" href="#">Follow</button>
                 <button class="direct-messages-with-user" href="#">Direct Messages</button>
             </div>
             <div class="who-follow"></div>
diff --git a/home.html b/home.html
index 162f890..86c9cb3 100644
--- a/home.html
+++ b/home.html
@@ -441,7 +441,7 @@
                   <li><a href="#"><span class="followers-count">&nbsp;</span><span class="label">Followers</span></a></li>
                 </ul>
               </div>
-              <button class="followButton follow" href="#">Follow</button>
+              <button class="dinamicFollowButton" href="#">Follow</button>
               <button class="direct-messages-with-user" href="#">Direct Messages</button>
               <button class="mentions-from-user" href="#">Mentions</a>
             </div>
diff --git a/js/interface_common.js b/js/interface_common.js
index 2bc8e74..4a9e0c0 100644
--- a/js/interface_common.js
+++ b/js/interface_common.js
@@ -135,9 +135,14 @@ function openProfileModalWithUsernameHandler(username)
 
     //hed//add dinamic follow button in profile modal window
     if(followingUsers.indexOf(username) != -1){
-        $('.profile-card button.followButton').first().removeClass('follow').addClass('profileUnfollow').text(polyglot.t('Unfollow')).on('click', function(){
+        $('.profile-card button.dinamicFollowButton').first().addClass('profileUnfollow').text(polyglot.t('Unfollow')).on('click', function(){
             unfollow(username);
+            closeModal($(this));
+            // delay reload so dhtput may do it's job
+            window.setTimeout("location.reload();",500);
         });
+    } else {
+        $('.profile-card button.dinamicFollowButton').first().addClass('follow').text(polyglot.t('Follow')).on('click', userClickFollow );
     };
 
     $(".tox-ctc").attr("title", polyglot.t("Copy to clipboard"));
diff --git a/js/twister_following.js b/js/twister_following.js
index 270017d..599e64f 100644
--- a/js/twister_following.js
+++ b/js/twister_following.js
@@ -710,6 +710,8 @@ function initUserSearch() {
     $(".following-config-method-buttons .public-following").bind( "click", setFollowingMethod );
     $(".following-config-method-buttons .public-following").click( function() {
         closeModal($(this));
+        // delay reload so dhtput may do it's job
+        window.setTimeout("location.reload();",500);
     });
 }
 
@@ -755,10 +757,7 @@ function setFollowingMethod(e) {
     }
 
     //console.log("start following @" +username +" by method "+method);
-    follow(username, method, function() {
-        // delay reload so dhtput may do it's job
-        window.setTimeout("location.reload();",500);
-    });
+    follow(username, method);
 }