diff --git a/app/controllers/admin/registrations_controller.rb b/app/controllers/admin/registrations_controller.rb
index 3144b0c8..30236e58 100644
--- a/app/controllers/admin/registrations_controller.rb
+++ b/app/controllers/admin/registrations_controller.rb
@@ -6,7 +6,7 @@ class Admin::RegistrationsController < ApplicationController
     @pdf_filename = "#{@conference.title}.pdf"
     @registrations = @conference.registrations.includes(:person).order("registrations.created_at ASC")
     @attended = @conference.registrations.where("attended = ?", true).count
-    @headers = %w[attended name email attending_social_events attending_with_partner need_access other_needs arrival departure]
+    @headers = %w[name email attending_social_events attending_with_partner need_access other_needs arrival departure attended]
   end
 
   def change_field
@@ -21,7 +21,7 @@ class Admin::RegistrationsController < ApplicationController
       redirect_to admin_conference_registrations_path(@conference.short_title, @registration)
       flash[:notice] = "Updated '#{params[:view_field]}' for #{(Person.where("id = ?", @registration.person_id).first).email}"
   end
-  
+
   def edit
     @registration = @conference.registrations.where("id = ?", params[:id]).first
     @person = Person.where("id = ?", @registration.person_id).first
@@ -34,10 +34,12 @@ class Admin::RegistrationsController < ApplicationController
     begin
       @person.update_attributes!(params[:registration][:person_attributes])
       params[:registration].delete :person_attributes
-      @registration.supporter_registration = @conference.supporter_registrations.new(params[:registration][:supporter_registration_attributes])
-      params[:registration].delete :supporter_registration_attributes
+      if params[:registration][:supporter_registration]
+        @registration.supporter_registration.update_attributes(params[:registration][:supporter_registration_attributes])
+        params[:registration].delete :supporter_registration_attributes
+      end
       @registration.update_attributes!(params[:registration])
-      flash[:notice] = "Successfully updated Registration for #{@person.public_name} #{@person.email}"
+      flash[:notice] = "Successfully updated registration for #{@person.public_name} #{@person.email}"
       redirect_to(admin_conference_registrations_path(@conference.short_title))
     rescue Exception => e
       Rails.logger.debug e.backtrace.join("\n")
@@ -46,11 +48,70 @@ class Admin::RegistrationsController < ApplicationController
     end
   end
 
+  def new
+    @user = User.new
+    @person = Person.new
+    @registration = @person.registrations.new
+    @supporter_registration = @conference.supporter_registrations.new
+    @conference = Conference.find_all_by_short_title(params[:conference_id]).first
+  end
+  
+  def create
+    @conference = Conference.find_all_by_short_title(params[:conference_id]).first
+    person = Person.where("email LIKE ?", params[:registration][:user][:email]).first
+    
+    if !person.nil?
+      reg = @conference.registrations.where("person_id = ?", person.id).first
+      if reg.nil?
+        registration = person.registrations.new
+      else
+        redirect_to admin_conference_registrations_path(@conference.short_title)
+        flash[:notice] = "#{person.email} is already registred!"
+        return
+      end
+    else
+      if params[:registration][:person][:first_name].blank? || params[:registration][:person][:last_name].blank?
+         redirect_to(:back, :alert => "Please fill in your first and last name before registering.")
+         return
+      end
+      user = User.new
+      user.email = params[:registration][:user][:email]
+      user.password = rand(36**6).to_s(36)
+      begin user.save!
+        user.skip_confirmation!
+        person = Person.where("user_id = ?", user.id).first
+        person.update_attributes(params[:registration][:person])
+        begin
+          registration = person.registrations.new
+          if params[:registration][:supporter_registration]
+            registration.supporter_registration = @conference.supporter_registrations.new(:supporter_level_id => params[:registration][:supporter_registration][:supporter_level_id], :code => params[:registration][:supporter_registration][:code], :email => person.email, :name => person.public_name)
+          end
+        rescue Exception => e
+          user.destroy
+          person.destroy
+          redirect_to(:back, :alert => "Did not create registration. #{e.message}")
+          return
+        end
+      rescue Exception => e
+        redirect_to(:back, :alert => "Did not create new user/person. #{e.message}")
+        return
+      end
+    end
+    params[:registration].delete :person
+    params[:registration].delete :user
+    params[:registration].delete :supporter_registration
+    registration.update_attributes(params[:registration])
+    registration.update_attributes(:conference_id => @conference.id, :attended => true)
+    registration.save!
+    redirect_to admin_conference_registrations_path(@conference.short_title)
+    flash[:notice] = "Successfully created new registration for #{person.email}."
+  end
+
   def delete
     if has_role?(current_user, "Admin")
       registration = @conference.registrations.where(:id => params[:id]).first
       person = Person.where("id = ?", registration.person_id).first
-
+      
       begin registration.destroy
         redirect_to admin_conference_registrations_path
         flash[:notice] = "Deleted registration for #{person.public_name} #{person.email}"
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 124bc5eb..b30b1598 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -15,50 +15,5 @@ class Admin::UsersController < ApplicationController
     user = User.find(params[:id])
     user.update_attributes!(params[:user])
     redirect_to admin_users_path, :notice => "Updated #{user.email}"
-  end
-  
-  def new
-    @user = User.new
-    @person = Person.where("user_id =?", @user.id)
-    @conferences = Conference.where("end_date >= ?", Time.now)
-    @conference = Conference.find_all_by_short_title(params[:format]).first
-  end
-  
-  def create
-    @conference = Conference.find_all_by_short_title(params[:id]).first
-    
-    if params[:user][:people][:first_name].blank? || params[:user][:people][:last_name].blank?
-      redirect_to(:back, :alert => "Please fill in your first and last name before registering.")
-      return
-    end
-
-    params[:user][:conferences].shift
-    if !params[:user][:conferences].empty?
-      user = User.new
-      user.email = params[:user][:email]
-      user.password = params[:user][:password]
-      begin
-        user.save!
-        user.skip_confirmation!
-        person = Person.where("user_id = ?", user.id).first
-        person.update_attributes(params[:user][:people])
-        begin
-          params[:user][:conferences].each do |r|
-            registration = person.registrations.new(:conference_id => r, :attended => 't')
-            registration.save!
-          end
-          redirect_to admin_conference_registrations_path(@conference.short_title)
-          flash[:notice] = "Successfully created new registration for #{person.email}."
-          rescue Exception => e
-          redirect_to(:back, :alert => "Did not create registration. #{e.message}")
-          return
-        end
-        rescue Exception => e
-          redirect_to(:back, :alert => "Did not create new user/person. #{e.message}")
-          return
-      end
-    else
-      redirect_to(:back, :alert => "Please select at least one conference to register.")
-    end
-  end
+  end  
 end
\ No newline at end of file
diff --git a/app/models/registration.rb b/app/models/registration.rb
index 3c5329e1..92778f07 100644
--- a/app/models/registration.rb
+++ b/app/models/registration.rb
@@ -4,6 +4,7 @@ class Registration < ActiveRecord::Base
   belongs_to :dietary_choice
 
   has_one :supporter_registration
+  has_one :supporter_level, :through => :supporter_registration
   has_and_belongs_to_many :social_events
   has_and_belongs_to_many :events
 
diff --git a/app/views/admin/registrations/edit.html.haml b/app/views/admin/registrations/edit.html.haml
index bc06d775..f93341de 100644
--- a/app/views/admin/registrations/edit.html.haml
+++ b/app/views/admin/registrations/edit.html.haml
@@ -2,24 +2,71 @@
   .row-fluid
     .span12
       %h3
-        Edit registration of #{@person.public_name} for #{@conference.title}
+        Edit registration of #{@person.public_name} (#{@person.email}) for #{@conference.title}
         %br
   .row-fluid
     .span12
       = semantic_form_for(@registration, :url => admin_conference_registrations_edit_path(@conference.short_title, @registration.id), :html => { :method => :put }) do |f|
-        .span6
-          = f.inputs :name => "Personal Data" do
-            = f.fields_for :person do |p|
-              = p.label :first_name
-              = p.text_field :first_name
-              = p.label :last_name
-              = p.text_field :last_name
-              = p.label :email
-              = p.text_field :email
-              = p.label :affiliation
-              = p.text_field :company
-              = p.label :Nickname
-              = p.text_field :irc_nickname
-        = render :partial => 'shared/conference_registration', :locals => { :f => f }
 
+        = f.inputs "Personal Information" do
+          = f.fields_for :person do |p|
+            = p.input :first_name, :as => :string
+            = p.input :last_name, :as => :string
+            = p.label :Nickname, :as => :string
+            = p.text_field :irc_nickname, :as => :string
+            = p.label :Affiliation
+            = p.text_field :company, :placeholder => "Company/User Group/nothing", :as => :string
+
+        = f.inputs "Registration Information" do
+          - if @conference.use_supporter_levels?
+            = f.semantic_fields_for :supporter_registration do |reg|
+              = reg.input :supporter_level, :as => :select, :collection => @conference.supporter_levels
+              = reg.input :code, :label => "Confirmation or registration code (if applicable)"
+              %span#supporter-link.help-block
+
+          = f.input :attending_with_partner, :label => false
+          = f.input :using_affiliated_lodging, :label => false
+          = f.input :handicapped_access_required, :label => false
+          = f.input :other_special_needs, :label => "Any other special needs?", :input_html => {:rows => 2, :class => "span6"}
+
+        - if @conference.social_events.count > 0
+          = f.inputs "Are you planning to attend any of the parties?" do
+            %br Yes, I'll be attending...
+            %br
+            = f.input :social_events, :as => :check_boxes, :label => false, :collection => @conference.social_events
+
+        - if @conference.use_dietary_choices?
+          = f.inputs "Food" do
+            = f.input :dietary_choice, :collection => [["None", nil]] + @conference.dietary_choices.map {|x| [x.title, x.id]},
+                :include_blank => false, :label => "Special Dietary Restriction"
+            = f.input :other_dietary_choice, :input_html => {:rows => "2", :class => "span6"}, :label => "Other Dietary Restictions (please describe)"
         = f.action :submit, :button_html => { :value => "Edit Registration", :class => "btn btn-primary" }
+:javascript
+    $("#registration_supporter_registration_attributes_supporter_level_id").change(function () {
+      var str = "";
+      #{generate_supporter_level_js @conference}
+      $("#supporter-link").html(str);
+    })
+    .trigger('change');
+
+    $("#registration-arrival-datepicker").datetimepicker({
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
+        numberOfMonths: 1,
+        defaultDate: '#{@conference.start_date.yesterday.strftime('%Y-%m-%d')}',
+        onSelect: function(selected) {
+            $("#registration-departure-datepicker").datepicker("option","minDate", selected)
+        }
+    });
+
+    $("#registration-departure-datepicker").datetimepicker({
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
+        numberOfMonths: 1,
+        defaultDate: '#{@conference.end_date.tomorrow.strftime('%Y-%m-%d')}',
+        onSelect: function(selected) {
+            $("#registration-arrival-datepicker").datepicker("option","maxDate", selected)
+        }
+    });
\ No newline at end of file
diff --git a/app/views/admin/registrations/new.html.haml b/app/views/admin/registrations/new.html.haml
new file mode 100644
index 00000000..1d81f757
--- /dev/null
+++ b/app/views/admin/registrations/new.html.haml
@@ -0,0 +1,74 @@
+.row
+  .span12
+    %h3
+      Create new account and registration
+.row
+  .span12
+    = semantic_form_for(@registration, :url => admin_conference_registrations_new_path(@conference.short_title), :html => { :method => :put }) do |f|
+
+      = f.inputs "Your details" do
+        = f.fields_for :user do |u|
+          = u.input :email, :as => :string, :hint => "Please enter a valid email address. You will need it to log in to OSEM later."
+        = f.fields_for @person do |p|
+          = p.input :first_name, :as => :string
+          = p.input :last_name, :as => :string
+          = p.input :public_name, :as => :string
+          = p.label :Nickname
+          = p.text_field :irc_nickname, :as => :string
+          = p.label :Affiliation
+          = p.text_field :company, :placeholder => "Company/User Group/nothing", :as => :string
+
+      = f.inputs "Registration Information" do
+        - if @conference.use_supporter_levels?
+          = f.semantic_fields_for @supporter_registration do |reg|
+            = reg.input :supporter_level, :as => :select, :collection => @conference.supporter_levels
+            = reg.input :code, :label => "Confirmation or registration code (if applicable)"
+            %span#supporter-link.help-block
+
+        = f.input :attending_with_partner, :label => false
+        = f.input :using_affiliated_lodging, :label => false
+        = f.input :handicapped_access_required, :label => false
+        = f.input :other_special_needs, :label => "Any other special needs?", :input_html => {:rows => 2, :class => "span6"}
+
+      - if @conference.social_events.count > 0
+        = f.inputs "Are you planning to attend any of the parties?" do
+          %br Yes, I'll be attending...
+          %br
+          = f.input :social_events, :as => :check_boxes, :label => false, :collection => @conference.social_events
+
+      - if @conference.use_dietary_choices?
+        = f.inputs "Food" do
+          = f.input :dietary_choice, :collection => [["None", nil]] + @conference.dietary_choices.map {|x| [x.title, x.id]},
+              :include_blank => false, :label => "Special Dietary Restriction"
+          = f.input :other_dietary_choice, :input_html => {:rows => "2", :class => "span6"}, :label => "Other Dietary Restictions (please describe)"
+      = f.action :submit, :button_html => { :value => "Create", :class => "btn btn-primary"}
+      
+:javascript
+    $("#registration_supporter_registration_attributes_supporter_level_id").change(function () {
+      var str = "";
+      #{generate_supporter_level_js @conference}
+      $("#supporter-link").html(str);
+    })
+    .trigger('change');
+
+    $("#registration-arrival-datepicker").datetimepicker({
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
+        numberOfMonths: 1,
+        defaultDate: '#{@conference.start_date.yesterday.strftime('%Y-%m-%d')}',
+        onSelect: function(selected) {
+            $("#registration-departure-datepicker").datepicker("option","minDate", selected)
+        }
+    });
+
+    $("#registration-departure-datepicker").datetimepicker({
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
+        numberOfMonths: 1,
+        defaultDate: '#{@conference.end_date.tomorrow.strftime('%Y-%m-%d')}',
+        onSelect: function(selected) {
+            $("#registration-arrival-datepicker").datepicker("option","maxDate", selected)
+        }
+    });          
\ No newline at end of file
diff --git a/app/views/admin/registrations/show.html.haml b/app/views/admin/registrations/show.html.haml
index bd673302..6c921f6c 100644
--- a/app/views/admin/registrations/show.html.haml
+++ b/app/views/admin/registrations/show.html.haml
@@ -1,7 +1,7 @@
 .row-fluid
   .span12
     .pull-right{:style=>"margin-top:20px; margin-bottom:20px;"}
-      = link_to "New", admin_users_new_path(@conference.short_title), :class => "btn btn-primary"
+      = link_to "New", admin_conference_registrations_new_path(@conference.short_title), :class => "btn btn-primary"
       = link_to "Export PDF", admin_conference_registrations_path(@conference.short_title, :format => :pdf), :class => "btn btn-success"
       = link_to "Export xlsx", {:format => :xlsx}, :class => "btn btn-success"
 .row-fluid
@@ -29,12 +29,20 @@
           - @headers.each do |field|
             %td
               - if field == "name"
-                #{registration.last_name} #{registration.first_name} (#{registration.public_name})
+                #{registration.last_name} #{registration.first_name} (#{registration.nickname}) #{registration.affiliation}
+                - if registration.supporter_level && registration.supporter_level.title != 'Free'
+                  %p{:style => "color:red"}
+                    = registration.supporter_level.title
           
+              -elsif field == 'attended'
+                = link_to "#{registration.send(field.to_sym)}", admin_conference_registrations_change_field_path(@conference.short_title, :id => registration.id, :view_field => "#{field}"), :method => :put, ":#{field}" => registration.send(field.to_sym), :class => "btn btn-success"
+
               -elsif (registration.send(field.to_sym).class == TrueClass || registration.send(field.to_sym).class == FalseClass)
                 = link_to "#{registration.send(field.to_sym)}", admin_conference_registrations_change_field_path(@conference.short_title, :id => registration.id, :view_field => "#{field}"), :method => :put, ":#{field}" => registration.send(field.to_sym)
+
               - elsif field == 'arrival' || field == 'departure'
                 = registration.send(field.to_sym).strftime("%d %b %H:%M") if registration.send(field.to_sym)
+
               - else
                 = registration.send(field.to_sym)
           %td
diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml
deleted file mode 100644
index cddf0c1c..00000000
--- a/app/views/admin/users/new.html.haml
+++ /dev/null
@@ -1,20 +0,0 @@
-.row
-  .span12
-    %h3
-      Create new account and registration
-.row
-  .span12
-    = semantic_form_for(@user, :url => admin_users_new_path(:id => @conference.short_title), :html => { :method => :put }) do |f|
-      = f.inputs "Account Information" do
-        = f.input :email
-        = f.input :password, :hint => "Password must be at least 6 characters"
-      = f.inputs "Personal Information" do
-        = f.fields_for :people do |p|
-          = p.input :first_name
-          = p.input :last_name
-          = p.label :Nickname
-          = p.text_field :irc_nickname
-          = p.label :Affiliation
-          = p.text_field :company, :placeholder => "Company/User Group/nothing"
-      = f.input :conferences, :as => :check_boxes,  :label => true, :collection => @conferences
-      = f.action :submit, :button_html => { :value => "Create", :class => "btn btn-primary"}
diff --git a/config/routes.rb b/config/routes.rb
index 9d6a5485..2b78d62a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,7 +3,6 @@ Osem::Application.routes.draw do
   devise_for :users, :controllers => { :registrations => :registrations }, :path => 'accounts'
 
   namespace :admin do
-    put "/users/new" => "users#create"
     resources :users
     resources :people
     resources :conference do
@@ -11,6 +10,8 @@ Osem::Application.routes.draw do
       put "/schedule" => "schedule#update"
       get "/stats" => "stats#index"
       get "/registrations" => "registrations#show"
+      get "/registrations/new" => "registrations#new"
+      put "/registrations/new" => "registrations#create"
       get "/registrations/edit" => "registrations#edit"
       put "/registrations/edit" => "registrations#update"
       delete "/registrations"  => "registrations#delete"