diff --git a/client/client.coffee b/client/client.coffee
index 1c8bd72..36f3c8a 100644
--- a/client/client.coffee
+++ b/client/client.coffee
@@ -1,7 +1,6 @@
 # Homework - Client Side
 notes = new Meteor.Collection "notes"
 Deps.autorun -> Meteor.subscribe "my-notes" unless not Meteor.userId()
-#Meteor.subscribe "my-notes"
 
 # User Interface
 Template.userInfo.events {
diff --git a/client/index.html b/client/index.html
index fe73f51..f7f8f44 100644
--- a/client/index.html
+++ b/client/index.html
@@ -65,7 +65,7 @@
 </template>
 
 <template name="editor">
-  {{> notifications }}
+  <div align="center">{{> notifications }}</div>
   {{#if note}}
   <div class="panel panel-info">
     <div class="panel-heading">
diff --git a/server/server.coffee b/server/server.coffee
index c49c749..80d0899 100644
--- a/server/server.coffee
+++ b/server/server.coffee
@@ -1,6 +1,10 @@
 # Homework - Server Side
 notes = new Meteor.Collection "notes"
 
+validateEmail = (email) ->
+  expr = /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/
+  expr.test email
+
 Accounts.config {
   sendVerificationEmail: false
   loginExpirationInDays: 1
@@ -11,8 +15,7 @@ Meteor.publish "my-notes", ->
 
 # Authentication
 Accounts.validateNewUser (user) ->
-  if Match.test(user.email, String) and validateEmail user.email is yes
-    if user.password and Match.test(user.password,String) is yes and user.password.length > 7
-      return yes
-    else throw new Meteor.Error 403, "Invalid Password"
-  else throw new Meteor.Error 403, "Invalid Email"
+  mail = user.emails[0].address
+  if Match.test(mail,String) is no or validateEmail(mail) is no
+    throw new Meteor.Error 403, "Invalid Email"
+  return yes
diff --git a/server/util.coffee b/server/util.coffee
deleted file mode 100644
index a24d234..0000000
--- a/server/util.coffee
+++ /dev/null
@@ -1,5 +0,0 @@
-# Utility Stuff for Homework
-
-validateEmail = (email) ->
-  re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  re.test email