5 files changed, 57 insertions, 1 deletions
diff --git a/languages/en.php b/languages/en.php
index 49ac9c647..e956d78fc 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -25,8 +25,11 @@
 		 * User details
 		 */
 
+			'name' => "Display name",
+			'email' => "Email address",
 			'username' => "Username",
 			'password' => "Password",
+			'passwordagain' => "Password (again for verification)",
 	
 		/**
 		 * Dashboard
diff --git a/register.php b/register.php
new file mode 100644
index 000000000..442a798a9
--- /dev/null
+++ b/register.php
@@ -0,0 +1,27 @@
+<?php
+
+	/**
+	 * Elgg registration page
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+
+	/**
+	 * Start the Elgg engine
+	 */
+		require_once(dirname(__FILE__) . "/engine/start.php");
+
+	// If we're not logged in, display the registration page
+		if (!isloggedin()) {
+			echo page_draw(elgg_echo('register'), elgg_view("account/forms/register"));
+	// Otherwise, forward to the index page
+		} else {
+			forward();
+		}
+		
+?>
+\ No newline at end of file
diff --git a/views/default/login.php b/views/default/account/forms/login.php
index c17f87b33..c17f87b33 100644
--- a/views/default/login.php
+++ b/views/default/account/forms/login.php
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
new file mode 100644
index 000000000..aec0556c0
--- /dev/null
+++ b/views/default/account/forms/register.php
@@ -0,0 +1,26 @@
+<?php
+
+     /**
+	 * Elgg register form
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 */
+	 
+?>
+
+	<h2><?php echo elgg_echo('register'); ?></h2>
+	<div id="register-box">
+		<form action="<?php echo $vars['url']; ?>action/register" method="POST">
+			<p><label><?php echo elgg_echo('name'); ?><br /><input name="name" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('email'); ?><br /><input name="email" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('username'); ?><br /><input name="username" type="text" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('password'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
+			<label><?php echo elgg_echo('passwordagain'); ?><br /><input name="password" type="password" class="general-textarea" /></label><br />
+			<input type="submit" name="submit" value="<?php echo elgg_echo('register'); ?>" /></p>
+	    </form>
+	</div>
+\ No newline at end of file
diff --git a/views/default/welcome/logged_out.php b/views/default/welcome/logged_out.php
index 47e9ac19f..8d7146e16 100644
--- a/views/default/welcome/logged_out.php
+++ b/views/default/welcome/logged_out.php
@@ -18,6 +18,6 @@
 	</p>
 	<?php
 
-		echo elgg_view("login");
+		echo elgg_view("account/forms/login");
 	
 	?>
 \ No newline at end of file