diff --git a/app/models/article.rb b/app/models/article.rb
index 719a7cd..2a97e99 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -28,7 +28,7 @@ class Article < ActiveRecord::Base
   def initialize(*params)
     super
 
-    if !params.blank? && params.first.has_key?(:profile)
+    if !params.blank? && params.first.has_key?(:profile) && !params.first[:profile].blank?
       profile = params.first[:profile]
       self.published = false unless profile.public?
     end
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index dbeaf6c..0d59889 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -1527,12 +1527,12 @@ class ContentViewerControllerTest < ActionController::TestCase
   should 'use context method in extra toolbar actions on article from plugins' do
     class Plugin1 < Noosfero::Plugin
       def article_extra_toolbar_buttons(article)
-        if current_person.public?
+        if profile.public?
           {:title => 'some_title', :icon => 'some_icon', :url => '/someurl'}
         else
           {:title => 'another_title', :icon => 'another_icon', :url => '/anotherurl'}
         end
-      end
+       end
     end
     Noosfero::Plugin.stubs(:all).returns([Plugin1.name])
 
diff --git a/test/functional/organizations_controller_test.rb b/test/functional/organizations_controller_test.rb
index 09dafb2..7400611 100644
--- a/test/functional/organizations_controller_test.rb
+++ b/test/functional/organizations_controller_test.rb
@@ -86,7 +86,7 @@ class OrganizationsControllerTest < ActionController::TestCase
 
   should 'activate organization profile' do
     organization = fast_create(Organization, :visible => false, :environment_id => environment.id)
-    assert organization.disabled?
+    assert !organization.visible?
 
     get :activate, {:id => organization.id}
     organization.reload
--
libgit2 0.21.2