diff --git a/app/controllers/enterprise_controller.rb b/app/controllers/enterprise_controller.rb
index e154440..12f2460 100644
--- a/app/controllers/enterprise_controller.rb
+++ b/app/controllers/enterprise_controller.rb
@@ -6,29 +6,22 @@ class EnterpriseController < ApplicationController
     @enterprises = Enterprise.find(:all) - @my_enterprises
   end
   
-  def register
-    unless logged_in?
-      redirect_to :controller => 'account'
-    end
-  end
-
   def register_form
+    redirect_to :controller => 'account' unless logged_in?
+    @enterprise = Enterprise.new()
     @vitual_communities = VirtualCommunity.find(:all)
   end
 
-  def choose_validation_entity_or_net
-    @enterprise = Enterprise.new(params[:enterprise])
-  end
-
-  def create
+  def register
     @enterprise = Enterprise.new(params[:enterprise])
-    @enterprise.manager = current_user
+    @enterprise.manager_id = current_user.id
     if @enterprise.save
+      @enterprise.users << current_user
       flash[:notice] = _('Enterprise was succesfully created')
-      redirect_to :action => 'register'
+      redirect_to :action => 'index'
     else
       flash[:notice] = _('Enterprise was not created')
-      render :action => 'choose_validation_entity_or_net'
+      render :action => 'register'
     end
   end
 end
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 851ae76..d86158b 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -7,7 +7,7 @@ class Enterprise < ActiveRecord::Base
   
   has_one :enterprise_profile, :class_name => 'Profile', :as => :profile_owner
   has_many :affiliations
-  has_many :users, :through => :affiliation 
+  has_many :users, :through => :affiliations 
   belongs_to :manager, :class_name => 'User'
 
   validates_presence_of :name, :manager_id
diff --git a/app/views/enterprise/_enterprise.rhtml b/app/views/enterprise/_enterprise.rhtml
new file mode 100644
index 0000000..b42ec0f
--- /dev/null
+++ b/app/views/enterprise/_enterprise.rhtml
@@ -0,0 +1 @@
+<li> <%= enterprise.name %> </li>
diff --git a/app/views/enterprise/choose_validation_entity_or_net.rhtml b/app/views/enterprise/choose_validation_entity_or_net.rhtml
deleted file mode 100644
index 2dbcc44..0000000
--- a/app/views/enterprise/choose_validation_entity_or_net.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2><%= _('Choose validation entity or net') %></h2>
-
-list of entities or nets
-
-<p><%= link_to _('Create'), :action => 'create', :enterprise => @enterprise %>
-<%= link_to _('Back'), :action => 'register_form' %> </p>
diff --git a/app/views/enterprise/index.rhtml b/app/views/enterprise/index.rhtml
index ccdf682..cdd9589 100644
--- a/app/views/enterprise/index.rhtml
+++ b/app/views/enterprise/index.rhtml
@@ -1,3 +1,5 @@
-<p> <%= link_to _('Register new enterprise'), :action => 'register' %> </p>
+<p> <%= link_to _('Register new enterprise'), :action => 'register_form' %> </p>
 <h2> <%= _('Listing my enterprises') %> </h2>
-<%= render :partial => 'enterprise', :collection => @my_enterprises %>
+<ul>
+  <%= render :partial => 'enterprise', :collection => @my_enterprises %>
+</ul>
diff --git a/app/views/enterprise/register.rhtml b/app/views/enterprise/register.rhtml
deleted file mode 100644
index 78cb6b2..0000000
--- a/app/views/enterprise/register.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<h2><%= _('Information') %></h2>
-
-Information about how to proceed
-
-<p><%= link_to 'Next page', :action => 'register_form' %></p>
diff --git a/app/views/enterprise/register_form.rhtml b/app/views/enterprise/register_form.rhtml
index 17f15d4..615b002 100644
--- a/app/views/enterprise/register_form.rhtml
+++ b/app/views/enterprise/register_form.rhtml
@@ -2,7 +2,7 @@
 
 <h2><%= _('Register enterprise') %></h2>
 
-<% form_tag :action => 'choose_validation_entity_or_net' do %>
+<% form_tag :action => 'register' do %>
 <p><label for="name"><%= _('Name') %></label><br/>
 <%= text_field 'enterprise', 'name', 'size' => 20 %></p>
 
@@ -30,6 +30,6 @@
 <p><label for="management_information"><%= _('Management Information') %></label><br/>
 <%= text_area 'enterprise', 'management_information', 'cols' => 40, 'rows' => 20 %></p>
 
-<p><%= submit_tag 'Send' %>
-<%= link_to 'Cancel', :action => 'register' %></p>
+<p><%= submit_tag _('Register') %>
+<%= link_to _('Cancel'), :action => 'register' %></p>
 <% end %>
--
libgit2 0.21.2